diff --git a/samples/react-graph-auto-batching/.devcontainer/devcontainer.json b/samples/react-graph-auto-batching/.devcontainer/devcontainer.json new file mode 100644 index 000000000..4b1bdea04 --- /dev/null +++ b/samples/react-graph-auto-batching/.devcontainer/devcontainer.json @@ -0,0 +1,39 @@ +// For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer +{ + "name": "SPFx 1.13.0", + "image": "docker.io/m365pnp/spfx:1.13.0", + // Set *default* container specific settings.json values on container create. + "settings": {}, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "editorconfig.editorconfig", + "dbaeumer.vscode-eslint" + ], + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [ + 4321, + 35729 + ], + "portsAttributes": { + "4321": { + "protocol": "https", + "label": "Manifest", + "onAutoForward": "silent", + "requireLocalPort": true + }, + // Not needed for SPFx>= 1.12.1 + // "5432": { + // "protocol": "https", + // "label": "Workbench", + // "onAutoForward": "silent" + // }, + "35729": { + "protocol": "https", + "label": "LiveReload", + "onAutoForward": "silent", + "requireLocalPort": true + } + }, + "postCreateCommand": "bash .devcontainer/spfx-startup.sh", + "remoteUser": "node" +} \ No newline at end of file diff --git a/samples/react-graph-auto-batching/.devcontainer/spfx-startup.sh b/samples/react-graph-auto-batching/.devcontainer/spfx-startup.sh new file mode 100644 index 000000000..456d6aea8 --- /dev/null +++ b/samples/react-graph-auto-batching/.devcontainer/spfx-startup.sh @@ -0,0 +1,33 @@ +echo +echo -e "\e[1;94mInstalling Node dependencies\e[0m" +npm install + +## commands to create dev certificate and copy it to the root folder of the project +echo +echo -e "\e[1;94mGenerating dev certificate\e[0m" +gulp trust-dev-cert + +# Convert the generated PEM certificate to a CER certificate +openssl x509 -inform PEM -in ~/.rushstack/rushstack-serve.pem -outform DER -out ./spfx-dev-cert.cer + +# Copy the PEM ecrtificate for non-Windows hosts +cp ~/.rushstack/rushstack-serve.pem ./spfx-dev-cert.pem + +## add *.cer to .gitignore to prevent certificates from being saved in repo +if ! grep -Fxq '*.cer' ./.gitignore + then + echo "# .CER Certificates" >> .gitignore + echo "*.cer" >> .gitignore +fi + +## add *.pem to .gitignore to prevent certificates from being saved in repo +if ! grep -Fxq '*.pem' ./.gitignore + then + echo "# .PEM Certificates" >> .gitignore + echo "*.pem" >> .gitignore +fi + +echo +echo -e "\e[1;92mReady!\e[0m" + +echo -e "\n\e[1;94m**********\nOptional: if you plan on using gulp serve, don't forget to add the container certificate to your local machine. Please visit https://aka.ms/spfx-devcontainer for more information\n**********" \ No newline at end of file diff --git a/samples/react-graph-auto-batching/.gitignore b/samples/react-graph-auto-batching/.gitignore index d5ab57b0f..636a3337f 100644 --- a/samples/react-graph-auto-batching/.gitignore +++ b/samples/react-graph-auto-batching/.gitignore @@ -31,3 +31,7 @@ obj # Styles Generated Code *.scss.ts +# .CER Certificates +*.cer +# .PEM Certificates +*.pem diff --git a/samples/react-graph-auto-batching/.yo-rc.json b/samples/react-graph-auto-batching/.yo-rc.json index bbe4735fa..f1ac25fbf 100644 --- a/samples/react-graph-auto-batching/.yo-rc.json +++ b/samples/react-graph-auto-batching/.yo-rc.json @@ -5,10 +5,9 @@ "libraryId": "03631505-3899-4de0-bebe-f59283d991ba", "environment": "spo", "packageManager": "npm", - "isCreatingSolution": false, + "isCreatingSolution": true, "plusBeta": true, "isDomainIsolated": false, - "componentType": "adaptiveCardExtension", - "templateType": "Image" + "componentType": "webpart" } } \ No newline at end of file diff --git a/samples/react-graph-auto-batching/README.md b/samples/react-graph-auto-batching/README.md index 1eeee9f6e..5f117cca1 100644 --- a/samples/react-graph-auto-batching/README.md +++ b/samples/react-graph-auto-batching/README.md @@ -1,4 +1,4 @@ -# react-graph-auto-batching +# Graph auto batching ## Summary @@ -14,17 +14,24 @@ Finally, let me know if You would like to see this auto batcher in some library You may ask why I used AadHttpClient instead of MSGraphClient. AadHttpClient shares more similarity with a http client based on fetch api, this means it will be easier to adopt this solution to an implementation outside of SPFx. -## Used SharePoint Framework Version -![version](https://img.shields.io/badge/version-1.13-green.svg) +## Compatibility + +![SPFx 1.13.0](https://img.shields.io/badge/SPFx-1.13.0-green.svg) +![Node.js v14 | v12](https://img.shields.io/badge/Node.js-v14%20%7C%20v12-green.svg) +![Compatible with SharePoint Online](https://img.shields.io/badge/SharePoint%20Online-Compatible-green.svg) +![Does not work with SharePoint 2019](https://img.shields.io/badge/SharePoint%20Server%202019-Incompatible-red.svg "SharePoint Server 2019 requires SPFx 1.4.1 or lower") +![Does not work with SharePoint 2016 (Feature Pack 2)](https://img.shields.io/badge/SharePoint%20Server%202016%20(Feature%20Pack%202)-Incompatible-red.svg "SharePoint Server 2016 Feature Pack 2 requires SPFx 1.1") +![Local Workbench Unsupported](https://img.shields.io/badge/Local%20Workbench-Unsupported-red.svg "Local workbench is no longer available as of SPFx 1.13 and above") +![Hosted Workbench Compatible](https://img.shields.io/badge/Hosted%20Workbench-Compatible-green.svg) +![Compatible with Remote Containers](https://img.shields.io/badge/Remote%20Containers-Compatible-green.svg) + ## Applies to - [SharePoint Framework](https://aka.ms/spfx) - [Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant) -> Get your own free development tenant by subscribing to - ## Prerequisites None @@ -33,7 +40,7 @@ None Solution|Author(s) --------|--------- -react-graph-auto-batching | Marcin Wojciechowski [@mgwojciech](https://twitter.com/mgwojciech) +react-graph-auto-batching | [Marcin Wojciechowski](https://github.com/mgwojciech) [@mgwojciech](https://twitter.com/mgwojciech) ## Version history @@ -41,27 +48,22 @@ Version|Date|Comments -------|----|-------- 1.0|February 3, 2022|Initial release -## Disclaimer - -**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.** - ---- - ## Minimal Path to Awesome -- Clone this repository -- Ensure that you are at the solution folder -- in the command-line run: - - **npm install** - - **gulp serve** +* Clone this repository (or [download this solution as a .ZIP file](https://pnp.github.io/download-partial/?url=https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-graph-auto-batching) then unzip it) +* From your command line, change your current directory to the directory containing this sample (`react-graph-auto-batching`, located under `samples`) +* in the command line run: + * `npm install` + * `gulp serve` + - Add Graph Auto Batching To run tests - Clone this repository -- Ensure that you are at the solution folder -- in the command-line run: - - **npm install** - - **npx jest** +* Clone this repository (or [download this solution as a .ZIP file](https://pnp.github.io/download-partial/?url=https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-graph-auto-batching) then unzip it) +* From your command line, change your current directory to the directory containing this sample (`react-graph-auto-batching`, located under `samples`) +* in the command line run: + * `npm install` + * `npx jest` ## Features @@ -82,4 +84,30 @@ This extension illustrates the following concepts: - [Use Microsoft Graph in your solution](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/using-microsoft-graph-apis) - [Publish SharePoint Framework applications to the Marketplace](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/publish-to-marketplace-overview) - [Microsoft 365 Patterns and Practices](https://aka.ms/m365pnp) - Guidance, tooling, samples and open-source controls for your Microsoft 365 development -- You can find more on unit testing on my [Blog](https://mgwdevcom.wordpress.com) \ No newline at end of file +- You can find more on unit testing on my [Blog](https://mgwdevcom.wordpress.com) + + +## Help + + +We do not support samples, but this community is always willing to help, and we want to improve these samples. We use GitHub to track issues, which makes it easy for community members to volunteer their time and help resolve issues. + +If you're having issues building the solution, please run [spfx doctor](https://pnp.github.io/cli-microsoft365/cmd/spfx/spfx-doctor/) from within the solution folder to diagnose incompatibility issues with your environment. + +You can try looking at [issues related to this sample](https://github.com/pnp/sp-dev-fx-webparts/issues?q=label%3A%22sample%3A%20react-graph-auto-batching%22) to see if anybody else is having the same issues. + +You can also try looking at [discussions related to this sample](https://github.com/pnp/sp-dev-fx-webparts/discussions?discussions_q=react-graph-auto-batching) and see what the community is saying. + +If you encounter any issues while using this sample, [create a new issue](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected%2Csample%3A%20react-graph-auto-batching&template=bug-report.yml&sample=react-graph-auto-batching&authors=@mgwojciech&title=react-graph-auto-batching%20-%20). + +For questions regarding this sample, [create a new question](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Aquestion%2Csample%3A%20react-graph-auto-batching&template=question.yml&sample=react-graph-auto-batching&authors=@mgwojciech&title=react-graph-auto-batching%20-%20). + +Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Aenhancement%2Csample%3A%20react-graph-auto-batching&template=suggestion.yml&sample=react-graph-auto-batching&authors=@mgwojciech&title=react-graph-auto-batching%20-%20). + + +## Disclaimer + +**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.** + + + diff --git a/samples/react-graph-auto-batching/assets/sample.json b/samples/react-graph-auto-batching/assets/sample.json new file mode 100644 index 000000000..f83772484 --- /dev/null +++ b/samples/react-graph-auto-batching/assets/sample.json @@ -0,0 +1,50 @@ +[ + { + "name": "pnp-sp-dev-spfx-web-parts-react-graph-auto-batching", + "source": "pnp", + "title": "Graph auto batching", + "shortDescription": "This same shows how to abstract batching graph requests", + "url": "https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-graph-auto-batching", + "longDescription": [ + "This same shows how to abstract batching graph requests" + ], + "creationDateTime": "2022-02-03", + "updateDateTime": "2022-02-03", + "products": [ + "SharePoint" + ], + "metadata": [ + { + "key": "CLIENT-SIDE-DEV", + "value": "React" + }, + { + "key": "SPFX-VERSION", + "value": "1.13.0" + } + ], + "thumbnails": [ + { + "type": "image", + "order": 100, + "url": "https://github.com/pnp/sp-dev-fx-webparts/raw/gh-pages/img/_nopreview.png", + "alt": "No preview available" + } + ], + "authors": [ + { + "gitHubAccount": "mgwojciech", + "pictureUrl": "https://github.com/mgwojciech.png", + "name": "Marcin Wojciechowski", + "company": "Valo" + } + ], + "references": [ + { + "name": "Build your first SharePoint client-side web part", + "description": "Client-side web parts are client-side components that run in the context of a SharePoint page. Client-side web parts can be deployed to SharePoint environments that support the SharePoint Framework. You can also use modern JavaScript web frameworks, tools, and libraries to build them.", + "url": "https://docs.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/build-a-hello-world-web-part" + } + ] + } +] \ No newline at end of file diff --git a/samples/react-graph-auto-batching/config/config.json b/samples/react-graph-auto-batching/config/config.json index f6b0fc749..ffe9fdcbd 100644 --- a/samples/react-graph-auto-batching/config/config.json +++ b/samples/react-graph-auto-batching/config/config.json @@ -9,19 +9,10 @@ "manifest": "./src/webparts/graphAutoBatching/GraphAutoBatchingWebPart.manifest.json" } ] - }, - "profile-card-adaptive-card-extension": { - "components": [ - { - "entrypoint": "./lib/adaptiveCardExtensions/profileCard/ProfileCardAdaptiveCardExtension.js", - "manifest": "./src/adaptiveCardExtensions/profileCard/ProfileCardAdaptiveCardExtension.manifest.json" - } - ] } }, "externals": {}, "localizedResources": { - "GraphAutoBatchingWebPartStrings": "lib/webparts/graphAutoBatching/loc/{locale}.js", - "ProfileCardAdaptiveCardExtensionStrings": "lib/adaptiveCardExtensions/profileCard/loc/{locale}.js" + "GraphAutoBatchingWebPartStrings": "lib/webparts/graphAutoBatching/loc/{locale}.js" } } diff --git a/samples/react-graph-auto-batching/package-lock.json b/samples/react-graph-auto-batching/package-lock.json index c1ddacfcc..b8c0e3cca 100644 --- a/samples/react-graph-auto-batching/package-lock.json +++ b/samples/react-graph-auto-batching/package-lock.json @@ -2466,21 +2466,6 @@ "typescript": "~3.7.2" } }, - "@microsoft/sp-adaptive-card-extension-base": { - "version": "1.13.0-beta.17", - "resolved": "https://registry.npmjs.org/@microsoft/sp-adaptive-card-extension-base/-/sp-adaptive-card-extension-base-1.13.0-beta.17.tgz", - "integrity": "sha512-7dN6fMG1WMPptPnhrsKo/cCZIBSWt9ypEfr80aatwT+DSrnezi4aZgz4gQZ1sQc2KdEjpeoikQRajZlnM6/zUg==", - "requires": { - "@microsoft/sp-component-base": "1.13.0-beta.17", - "@microsoft/sp-core-library": "1.13.0-beta.17", - "@microsoft/sp-diagnostics": "1.13.0-beta.17", - "@microsoft/sp-loader": "1.13.0-beta.17", - "@microsoft/sp-lodash-subset": "1.13.0-beta.17", - "@microsoft/sp-module-interfaces": "1.13.0-beta.17", - "@microsoft/sp-property-pane": "1.13.0-beta.17", - "tslib": "~1.10.0" - } - }, "@microsoft/sp-build-core-tasks": { "version": "1.13.0-beta.17", "resolved": "https://registry.npmjs.org/@microsoft/sp-build-core-tasks/-/sp-build-core-tasks-1.13.0-beta.17.tgz", diff --git a/samples/react-graph-auto-batching/package.json b/samples/react-graph-auto-batching/package.json index d70e57c17..8b6b5d855 100644 --- a/samples/react-graph-auto-batching/package.json +++ b/samples/react-graph-auto-batching/package.json @@ -16,8 +16,7 @@ "@microsoft/sp-property-pane": "1.13.0-beta.17", "@microsoft/sp-webpart-base": "1.13.0-beta.17", "@microsoft/sp-lodash-subset": "1.13.0-beta.17", - "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.17", - "@microsoft/sp-adaptive-card-extension-base": "1.13.0-beta.17" + "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.17" }, "devDependencies": { "@microsoft/rush-stack-compiler-3.7": "0.2.3",