Merge pull request #2443 from dknn/dev

Updated react-quickpoll to spfx 1.13.1

samples/react-quick-poll/.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.1",
+	"image": "docker.io/m365pnp/spfx:1.13.1",
+	// 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"
+}

samples/react-quick-poll/.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**********"

samples/react-quick-poll/.gitignore

@@ -30,3 +30,6 @@ obj
 
 # Styles Generated Code
 *.scss.ts
+
+# Folders
+release

samples/react-quick-poll/.yo-rc.json

@@ -2,7 +2,7 @@
   "@microsoft/generator-sharepoint": {
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.11.0",
+    "version": "1.13.1",
     "libraryName": "react-simple-poll",
     "libraryId": "890ced10-dacc-4d0d-b9df-355a289980b3",
     "packageManager": "npm",

samples/react-quick-poll/README.md

@@ -7,6 +7,7 @@ This component is developed for the users who really need to create a **Poll** w
 ![React-Quick-Poll](./assets/react-quick-poll.gif)
 
 Following are some of the features of this component.
+
 * **Easy** to setup with most of the configurations are optional.
 * **Flexible** to use without any critical configuration.
 * More than one poll questions can be added.
@@ -35,14 +36,15 @@ Following are some of the features of this component.
 6. **Preferred Chart Type** - Chart type to display the overall response for the question.
 
 > **Note:**
+>
 > * Poll questions with the same **'Start Date'** and **'End Date'** will follow the sort order to display the latest question to the end user.
 > * Once the user started to response to the poll, do not delete the question from the question collection. All the questions are mapped based on the **ID** auto generated. It cannot be recovered once deleted.
 > * Make sure the **Multi Choice** option is chosen wisely, do not change once the user started to response to the poll.
 
 ## Compatibility
 
-![SPFx 1.11](https://img.shields.io/badge/SPFx-1.11.0-green.svg)
+![SPFx 1.13.1](https://img.shields.io/badge/SPFx-1.13.1-green.svg)
-![Node.js v10](https://img.shields.io/badge/Node.js-v10-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")
@@ -70,49 +72,53 @@ Version|Date|Comments
 1.0.0.1|Feb 24 2020|Initial release
 2.0.0.0|Oct 17 2020|Initial release
 2.1.0.0|June 30, 2021|Updated simple poll component
+2.1.1.0|March 16, 2022|Updated to SPFx 1.13.1
 
-## Minimal Path to Awesome
+## Minimal path to awesome
 
-- Clone this repository
+* 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-quick-poll) then unzip it)
-- in the command line run:
+* From your command line, change your current directory to the directory containing this sample (`react-quick-poll`, located under `samples`)
-  - `npm install`
+* in the command line run:
-  - `gulp bundle --ship`
+  * `npm install`
-  - `gulp package-solution --ship`
+  * `gulp bundle --ship`
-- Add the `.sppkg` file to the app catalog and add the **Quick Poll** web part to the page.
+  * `gulp package-solution --ship`
+* Add the `.sppkg` file to the app catalog and add the **Quick Poll** web part to the page.
 
->  This sample can also be opened with [VS Code Remote Development](https://code.visualstudio.com/docs/remote/remote-overview). Visit https://aka.ms/spfx-devcontainer for further instructions.
+> This sample can also be opened with [VS Code Remote Development](https://code.visualstudio.com/docs/remote/remote-overview). Visit <https://aka.ms/spfx-devcontainer> for further instructions.
 
 ## Features
 
-- Used [PnP Property Pane Controls](https://sharepoint.github.io/sp-dev-fx-property-controls/) to create the property pane controls
+* Used [PnP Property Pane Controls](https://sharepoint.github.io/sp-dev-fx-property-controls/) to create the property pane controls
   * [PropertyFieldToggleWithCallout](https://sharepoint.github.io/sp-dev-fx-property-controls/controls/PropertyFieldToggleWithCallout/)
   * [PropertyFieldCollectionData](https://sharepoint.github.io/sp-dev-fx-property-controls/controls/PropertyFieldCollectionData/)
   * [PropertyFieldChoiceGroupWithCallout](https://sharepoint.github.io/sp-dev-fx-property-controls/controls/PropertyFieldChoiceGroupWithCallout/)
   * PropertyPaneTextField (From base property controls)
-- Used [PnP Reusable React Controls](https://sharepoint.github.io/sp-dev-fx-controls-react/)
+* Used [PnP Reusable React Controls](https://sharepoint.github.io/sp-dev-fx-controls-react/)
   * [Placeholder](https://sharepoint.github.io/sp-dev-fx-controls-react/controls/Placeholder/)
   * [ChartControl](https://sharepoint.github.io/sp-dev-fx-controls-react/controls/ChartControl/)
-- Used few styles and controls (Text, MessageBar, ProgressIndicator, PrimaryButton, ChoiceGroup, List, Checkbox) from [Office UI Fabric](https://developer.microsoft.com/en-us/fabric)
+* Used few styles and controls (Text, MessageBar, ProgressIndicator, PrimaryButton, ChoiceGroup, List, Checkbox) from [Office UI Fabric](https://developer.microsoft.com/en-us/fabric)
-- Used [PnP](https://pnp.github.io/pnpjs/) for communication with SharePoint.
+* Used [PnP](https://pnp.github.io/pnpjs/) for communication with SharePoint.
-- Used [Moment.js](https://momentjs.com/) for datetime formatting.
+* Used [Moment.js](https://momentjs.com/) for datetime formatting.
-
 
 ## Help
 
-We do not support samples, but we 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.
+
+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-quick-poll%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-quick-poll) 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-quick-poll&template=bug-report.yml&sample=react-quick-poll&authors=@sudharsank%20@dips365&title=react-quick-poll%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-quick-poll&template=question.yml&sample=react-quick-poll&authors=@sudharsank%20@dips365&title=react-quick-poll%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-quick-poll&template=question.yml&sample=react-quick-poll&authors=@sudharsank%20@dips365&title=react-quick-poll%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-quick-poll&template=suggestion.yml&sample=react-quick-poll&authors=@sudharsank%20@dips365&title=react-quick-poll%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.**
 
-
 <img src="https://pnptelemetry.azurewebsites.net/sp-dev-fx-webparts/samples/react-quick-poll" />
-

samples/react-quick-poll/assets/sample.json

@@ -9,7 +9,7 @@
       "This component is developed for the users who really need to create a Poll within a minute and with less maintenance."
     ],
     "creationDateTime": "2020-10-17",
-    "updateDateTime": "2021-06-30",
+    "updateDateTime": "2022-03-18",
     "products": [
       "SharePoint"
     ],
@@ -20,7 +20,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.11.0"
+        "value": "1.13.1"
       }
     ],
     "thumbnails": [

samples/react-quick-poll/config/config.json

@@ -11,7 +11,8 @@
       ]
     }
   },
-  "externals": {},
+  "externals": {}
+  ,
   "localizedResources": {
     "SimplePollWebPartStrings": "lib/webparts/simplePoll/loc/{locale}.js",
     "PropertyControlStrings": "node_modules/@pnp/spfx-property-controls/lib/loc/{locale}.js",

samples/react-quick-poll/config/serve.json

@@ -3,6 +3,9 @@
   "port": 4321,
   "https": true,
   "initialPage": "https://localhost:5432/workbench",
+  //you need to replace initialPage url with your sharepoint url
+  //Something like "initialPage": "https://<mysharepointurl>.sharepoint.com/sites/Mysite",
+
   "api": {
     "port": 5432,
     "entryPath": "node_modules/@microsoft/sp-webpart-workbench/lib/api/"

samples/react-quick-poll/gulpfile.js

@@ -4,4 +4,16 @@ const build = require('@microsoft/sp-build-web');
 
 build.addSuppression(`Warning - [sass] The local CSS class 'ms-Grid' is not camelCase and will not be type-safe.`);
 
+
+var getTasks = build.rig.getTasks;
+
+build.rig.getTasks = function () {
+  var result = getTasks.call(build.rig);
+
+  result.set('serve', result.get('serve-deprecated'));
+
+  return result;
+};
+
+
 build.initialize(require('gulp'));

samples/react-quick-poll/package.json

@@ -3,41 +3,38 @@
   "version": "2.1.0",
   "private": true,
   "main": "lib/index.js",
-  "engines": {
-    "node": ">=0.10.0"
-  },
   "scripts": {
     "build": "gulp bundle",
     "clean": "gulp clean",
     "test": "gulp test"
   },
   "dependencies": {
-    "@microsoft/sp-core-library": "1.11.0",
+    "@microsoft/sp-core-library": "1.13.1",
-    "@microsoft/sp-lodash-subset": "1.11.0",
+    "@microsoft/sp-lodash-subset": "1.13.1",
-    "@microsoft/sp-office-ui-fabric-core": "1.11.0",
+    "@microsoft/sp-office-ui-fabric-core": "1.13.1",
-    "@microsoft/sp-property-pane": "1.11.0",
+    "@microsoft/sp-property-pane": "1.13.1",
-    "@microsoft/sp-webpart-base": "1.11.0",
+    "@microsoft/sp-webpart-base": "1.13.1",
     "@pnp/polyfill-ie11": "^2.0.1-5",
     "@pnp/sp": "^2.0.2",
     "@pnp/spfx-controls-react": "^1.16.0",
     "@pnp/spfx-property-controls": "^1.16.0",
     "moment": "^2.24.0",
-    "office-ui-fabric-react": "6.214.0",
+    "office-ui-fabric-react": "7.174.1",
-    "react": "16.8.5",
+    "react": "16.13.1",
-    "react-dom": "16.8.5"
+    "react-dom": "16.13.1"
   },
   "resolutions": {
     "@types/react": "16.8.8"
   },
   "devDependencies": {
-    "@microsoft/rush-stack-compiler-3.3": "0.3.5",
+    "@microsoft/rush-stack-compiler-3.9": "0.4.47",
-    "@microsoft/sp-build-web": "1.11.0",
+    "@microsoft/sp-build-web": "1.13.1",
-    "@microsoft/sp-module-interfaces": "1.11.0",
+    "@microsoft/sp-module-interfaces": "1.13.1",
-    "@microsoft/sp-tslint-rules": "1.11.0",
+    "@microsoft/sp-tslint-rules": "1.13.1",
-    "@microsoft/sp-webpart-workbench": "1.11.0",
+    "@types/react": "16.9.51",
-    "@types/chai": "3.4.34",
+    "@types/react-dom": "16.9.8",
-    "@types/mocha": "2.2.38",
+    "ajv": "~6.12.3",
-    "ajv": "~5.2.2",
+    "gulp": "4.0.2",
-    "gulp": "~3.9.1"
+    "@types/webpack-env": "1.13.1"
   }
 }

samples/react-quick-poll/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./node_modules/@microsoft/rush-stack-compiler-3.3/includes/tsconfig-web.json",
+  "extends": "./node_modules/@microsoft/rush-stack-compiler-3.9/includes/tsconfig-web.json",
   "compilerOptions": {
     "target": "es5",
     "forceConsistentCasingInFileNames": true,
@@ -19,13 +19,13 @@
       "./node_modules/@microsoft"
     ],
     "types": [
-      "es6-promise",
       "webpack-env"
     ],
     "lib": [
       "es5",
       "dom",
-      "es2015.collection"
+      "es2015.collection",
+      "es2015.promise"
     ]
   },
   "include": [

samples/react-quick-poll/tslint.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@microsoft/sp-tslint-rules/base-tslint.json",
+  "extends": "./node_modules/@microsoft/sp-tslint-rules/base-tslint.json",
   "rules": {
     "class-name": false,
     "export-name": false,
@@ -17,7 +17,6 @@
     "no-switch-case-fall-through": true,
     "no-unnecessary-semicolons": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-with-statement": true,
     "semicolon": true,
     "trailing-comma": false,