Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

react-organization-chart Upgrade to 1.20 #5283

Merged
merged 6 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SPFx 1.18.2",
"image": "docker.io/m365pnp/spfx:1.18.2",
"name": "SPFx 1.20.2",
"image": "docker.io/m365pnp/spfx:1.20.2",
"customizations": {
"vscode": {
"extensions": [
Expand Down
33 changes: 0 additions & 33 deletions samples/react-organization-chart/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,6 @@ module.exports = {
'@rushstack/security/no-unsafe-regexp': 1,
// STANDARDIZED BY: @typescript-eslint\eslint-plugin\dist\configs\recommended.json
'@typescript-eslint/adjacent-overload-signatures': 1,
// STANDARDIZED BY: @typescript-eslint\eslint-plugin\dist\configs\recommended.json
//
// CONFIGURATION: By default, these are banned: String, Boolean, Number, Object, Symbol
'@typescript-eslint/ban-types': [
1,
{
'extendDefaults': false,
'types': {
'String': {
'message': 'Use \'string\' instead',
'fixWith': 'string'
},
'Boolean': {
'message': 'Use \'boolean\' instead',
'fixWith': 'boolean'
},
'Number': {
'message': 'Use \'number\' instead',
'fixWith': 'number'
},
'Object': {
'message': 'Use \'object\' instead, or else define a proper TypeScript type:'
},
'Symbol': {
'message': 'Use \'symbol\' instead',
'fixWith': 'symbol'
},
'Function': {
'message': 'The \'Function\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
}
}
}
],
// RATIONALE: Code is more readable when the type of every variable is immediately obvious.
// Even if the compiler may be able to infer a type, this inference will be unavailable
// to a person who is reviewing a GitHub diff. This rule makes writing code harder,
Expand Down
2 changes: 1 addition & 1 deletion samples/react-organization-chart/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.19.1
v18.20.3
7 changes: 4 additions & 3 deletions samples/react-organization-chart/.yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"@microsoft/generator-sharepoint": {
"plusBeta": false,
"isCreatingSolution": true,
"nodeVersion": "18.19.1",
"nodeVersion": "18.20.3",
"sdksVersions": {
"@microsoft/microsoft-graph-client": "3.0.2",
"@microsoft/teams-js": "2.12.0"
"@microsoft/teams-js": "2.24.0"
},
"version": "1.18.2",
"isDomainIsolated": false,
"version": "1.20.0",
"libraryName": "react-organization-chart",
"libraryId": "0b4a3e5d-123f-41ea-96c4-538c6a19932b",
"environment": "onprem19",
Expand Down
7 changes: 5 additions & 2 deletions samples/react-organization-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ This web part shows an organization chart based on specified user, and user can

This sample is optimally compatible with the following environment configuration:

![SPFx 1.18.2](https://img.shields.io/badge/SPFx-1.18.2-green.svg)
![Node.js v16 | v18](https://img.shields.io/badge/Node.js-v16%20%7C%20v18-green.svg)
![SPFx 1.20.0](https://img.shields.io/badge/SPFx-1.20.0-green.svg)
![Node.js v18](https://img.shields.io/badge/Node.js-v18-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")
Expand All @@ -34,13 +34,16 @@ This sample is optimally compatible with the following environment configuration

## Contributors


- [João Mendes](https://github.com/joaojmendes)
- [Passoli Mirko](https://github.com/Paxol)
- [Peter Paul Kirschner](https://github.com/petkir)

## Version history

|Version|Date|Comments|
|-------|----|--------|
|1.2|Oct, 2024|SPFx 1.20.0|
|1.1|Feb, 2024|Guest user filter + update to SPFx 1.18.2|
|1.0|May, 2021|Initial release|

Expand Down
15 changes: 11 additions & 4 deletions samples/react-organization-chart/assets/sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
{
"name": "pnp-sp-dev-spfx-web-parts-react-organization-chart",
"source": "pnp",
"title": "Organization Chart Web Part (SP2019 and Online)",
"title": "Organization Chart Web Part",
"shortDescription": "Shows an organization chart based on specified user, and user can navigate to show company organization",
"url": "https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-organization-chart",
"longDescription": [
"This web part shows an organization chart based on specified user, and user can navigate to show company organization.",
"Can be installed on SharePoint Server 2019, and SharePoint Online."
"Can be installed on SharePoint Online."
],
"creationDateTime": "2021-05-03",
"updateDateTime": "2024-02-25",
"updateDateTime": "2024-10-04",
"products": [
"SharePoint"
],
Expand All @@ -21,7 +21,7 @@
},
{
"key": "SPFX-VERSION",
"value": "1.18.2"
"value": "1.20.0"
}
],
"thumbnails": [
Expand Down Expand Up @@ -55,6 +55,13 @@
{
"gitHubAccount": "Paxol",
"pictureUrl": "https://github.com/Paxol.png"
},
{
"gitHubAccount": "petkir",
"company": "ACP CUBIDO Digital Solutions GmbH",
"pictureUrl": "https://github.com/petkir.png",
"name": "Peter Paul Kirschner",
"twitter": "petkir_at"
}
],
"references": [
Expand Down
4 changes: 0 additions & 4 deletions samples/react-organization-chart/config/copy-assets.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
"workingDir": "./temp/deploy/",

"account": "<!-- STORAGE ACCOUNT NAME -->",
"container": "react-organization-chart",
"accessKey": "<!-- ACCESS KEY -->"
"accessKey": "<!-- ACCESS KEY -->",
"workingDir": "./release/assets/"
}
35 changes: 33 additions & 2 deletions samples/react-organization-chart/config/package-solution.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,40 @@
"solution": {
"name": "react-organization-chart",
"id": "0b4a3e5d-123f-41ea-96c4-538c6a19932b",
"version": "1.1.0.0",
"version": "1.2.0.0",
"includeClientSideAssets": true,
"skipFeatureDeployment": true
"skipFeatureDeployment": true,
"isDomainIsolated": false,
"developer": {
"name": "",
"privacyUrl": "",
"termsOfUseUrl": "",
"websiteUrl": "",
"mpnId": "Undefined-1.20.0"
},
"metadata": {
"shortDescription": {
"default": "react-organization-chart description"
},
"longDescription": {
"default": "react-organization-chart description"
},
"screenshotPaths": [],
"videoUrl": "",
"categories": []
},
"features": [
{
"title": "react-organization-chart OrganizationChartWebPart Feature",
"description": "The feature that activates OrganizationChartWebPart from the react-organization-chart solution.",
"id": "0338da15-07f9-4a53-b267-d790fb495cca",
"version": "1.2.0.0",
"componentIds": [
"0338da15-07f9-4a53-b267-d790fb495cca"
]
}
]

},
"paths": {
"zippedPackage": "solution/react-organization-chart.sppkg"
Expand Down
4 changes: 2 additions & 2 deletions samples/react-organization-chart/config/serve.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/spfx-serve.schema.json",
"$schema": "https://developer.microsoft.com/json-schemas/core-build/serve.schema.json",
"port": 4321,
"https": true,
"initialPage": "https://{tenantDomain}/_layouts/workbench.aspx"
"initialPage": "https://enter-your-SharePoint-site/_layouts/workbench.aspx"
}
Loading
Loading