Skip to content

Commit

Permalink
Merge pull request #57 from OfficeDev/users/v-pogopalakr/cmp-v1.3-bug…
Browse files Browse the repository at this point in the history
…-fixes

CMP v1.3 bug fixes
  • Loading branch information
Porkai-Pandian authored Sep 3, 2021
2 parents e5de70a + a94d8d4 commit 73d7285
Show file tree
Hide file tree
Showing 18 changed files with 576 additions and 548 deletions.
Binary file modified Images/AddTab_ChampionAdd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Images/SyncToTeams.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Upgrade1.3-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Upgrade1.3-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Upgrade1.3-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 36 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ SharePoint Admin role
Once the package has been installed, API granted, and solution synced to Teams (steps documented below), the same admin will likely also be asked to complete the first run experience. This first run creates the SharePoint site (ChampionManagementPlatform)
that all assets of this solution will be created under. Additionaly permissions need to be modified by an owner of this site to include edit/contribute rights for the organizations ability to interact with the solution.

#Installation Types (Customized vs Standard)
# Installation Types (Customized vs Standard)

##Customized Installation
## Customized Installation
The customized installation makes the assumption you wish to change the default variables (site location, text or visual aspects, etc) with the Champion Management Platform. Customizing the installation takes it outside of
configurations we have tested against but allows you to modify any aspect of the platform. Below are high level steps to get you started on a customized installation.

Expand Down Expand Up @@ -146,7 +146,7 @@ If desired the administrator can configure the installation location including t
3. Navigate to the solution folder where you cloned and locate the newly created ***cmp.sppkg*** package in ***"sharepoint/solution"***.


##Standard Installation
## Standard Installation
The standard installation assumes you would like to take the SharePoint package file located in our GitHub repository and install using the configuration outlined in this readme file (assets all created under a SharePoint site
called ChampionManagementPlatform as well as the default list names and all related teamwork champion terms within the application)

Expand Down Expand Up @@ -272,6 +272,14 @@ CLbHomeWebPart.manifest.json is updated with a new entry, TeamsPersonalApp
Once you have performed the above steps, the deployment of the Champion Management Platform is now complete. If an admin was deploying this on behalf of the manager of the Champion Management Platform please have the admin add the
Champion Management Platform manager as a champion and change their role in the Memberlist from ***Champion*** to ***Manager*** so they will have access to the other parts of the platform.

### Updated in version 1.3.0.0

1. Improved App installation process to fix issues while installing the app.
2. Upgraded NPM packages to recommended version for better performance, security and latest fixes.
3. Fixed an issue where the App is not working as expected when more than 100 champions are added to the system.
4. Fixed an issue with incorrect rank of current user being displayed on the side bar under Leaderboard screen.


### Updated in version 1.2.0.0

1. 'Member List' is now created right under 'ChampionManagementPlatform' site. This was created in the root site in version 1.1.0.0
Expand All @@ -283,9 +291,31 @@ Champion Management Platform manager as a champion and change their role in the
3. Column type for 'Description' is modified to 'Single line of text' from 'Choice'
4. 'Member Name' and 'Event Name' columns are added to 'Event Track List' SharePoint list.

### Upgrade to version 1.2.0.0
### Upgrade to version 1.3.0.0 from 1.2.0.0

If you are already having version 1.2.0.0 installed on your tenant follow the below steps to upgrade:

1. Navigate to App Catalog with a tenant Admin account. Do not delete the existing 1.2.0.0 package.Upload the new package that is downloaded from "sharepoint/solution" folder which will replace the existing package.

![Upgrade 1.3](./Images/Upgrade1.3-1.png)

2. Click on "Deploy".

![Upgrade 1.3](./Images/Upgrade1.3-2.png)

3. "Check In" the package.

![Upgrade 1.3](./Images/Upgrade1.3-3.png)

4. Select the package and click "Sync to Teams" from the ribbon and wait for the "Successfully synced to teams solution" message to appear

![Upgrade 1.3](./Images/SyncToTeams.png)

5. The Champion Management Platform will be updated to the latest version and you will see changes reflected in Teams. Please note that if you do not see changes reflected in Teams after 30 minutes you can log out and back in and clear the Teams cache to see changes immediately.

### Upgrade to version 1.3.0.0 from 1.1.0.0

If you are already having 1.1.0.0 installed on your tenant and want to upgrade to 1.2.0.0 the existing app and SharePoint site 'ChampionManagementSite' have to be deleted.
If you are already having 1.1.0.0 installed on your tenant and want to upgrade to 1.3.0.0 the existing app and SharePoint site 'ChampionManagementSite' have to be deleted.

If you have current members and events you will want to export those list items and import re-import them into the respective list areas. We have expanded our lists to have some additional data as well so you may need to populate additional fields.

Expand All @@ -312,7 +342,7 @@ Follow the below steps to upgrade your install and optionally also export and im
![Quick Start Guide](./Images/Upgrade2.png)

4. Delete 'cmp.sppkg' from App Catalog.
5. Startover the installation of new package following instructions from the section 'Install Champion Leaderboard SPFx Package' of this document.
5. Startover the installation of new package following instructions from the section 'Standard Installation' of this document.
6. Once the install has completed and first run is done, you can visit the site assets of the ChampionManagementPlatform and import any of the exported Champion data


Expand Down
2 changes: 1 addition & 1 deletion config/package-solution.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"solution": {
"name": "championmanagement",
"id": "5099a3ef-113f-4baf-bb6a-a73b1dd286f8",
"version": "1.2.0.0",
"version": "1.3.0.0",
"includeClientSideAssets": true,
"skipFeatureDeployment": true,
"isDomainIsolated": false,"developer": {
Expand Down
Binary file modified sharepoint/solution/cmp.sppkg
Binary file not shown.
5 changes: 3 additions & 2 deletions src/webparts/clbHome/components/ApproveChampion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ class ApproveChampion extends React.Component<IClbChampionsListProps, IState> {
};
this._getListData();
}


//Get the list of Members from member List
private _getListData(): Promise<ISPLists> {
return this.props.context.spHttpClient
.get(
"/" + siteconfig.inclusionPath + "/" + siteconfig.sitename + "/_api/web/lists/GetByTitle('Member List')/Items",
"/" + siteconfig.inclusionPath + "/" + siteconfig.sitename + "/_api/web/lists/GetByTitle('Member List')/Items?$top=1000",
SPHttpClient.configurations.v1
)
.then((response: SPHttpClientResponse) => {
Expand Down
2 changes: 1 addition & 1 deletion src/webparts/clbHome/components/ChampionLeaderBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function ChampionLeaderBoard(props: ChampionLeaderBoardProps) {
if (!eventdata.error) {
setEventDropDown(_.orderBy(eventdata.value.filter(ed => ed.IsActive), ['Id'], ['asc']));
props.context.spHttpClient.get(
"/"+inclusionpath+"/"+siteName+ "/_api/web/lists/GetByTitle('Member List')/Items?$filter= Status eq 'Approved'", SPHttpClient.configurations.v1)
"/"+inclusionpath+"/"+siteName+ "/_api/web/lists/GetByTitle('Member List')/Items?$top=1000&$filter= Status eq 'Approved'", SPHttpClient.configurations.v1)
// tslint:disable-next-line: no-shadowed-variable
.then((response: SPHttpClientResponse) => {
response.json().then((datada) => {
Expand Down
7 changes: 4 additions & 3 deletions src/webparts/clbHome/components/ChampionvView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export default class ChampionvView extends Component<
this.state.inclusionpath +
"/" +
this.state.sitename +
"/_api/web/lists/GetByTitle('Event Track Details')/Items",
"/_api/web/lists/GetByTitle('Event Track Details')/Items?$top=5000",
SPHttpClient.configurations.v1
);
if (response.status === 200) {
Expand Down Expand Up @@ -438,6 +438,7 @@ export default class ChampionvView extends Component<
return formateDateCollection;
}

//Get Member ID of the current user and the Event Track details from Member List
public getMemberId(): number {
this.props.context.spHttpClient
.get(
Expand All @@ -454,7 +455,7 @@ export default class ChampionvView extends Component<
this.state.inclusionpath +
"/" +
this.state.sitename +
"/_api/web/lists/GetByTitle('Member List')/Items",
"/_api/web/lists/GetByTitle('Member List')/Items?$top=1000",
SPHttpClient.configurations.v1
)
.then((response: SPHttpClientResponse) => {
Expand All @@ -472,7 +473,7 @@ export default class ChampionvView extends Component<
this.state.inclusionpath +
"/" +
this.state.sitename +
"/_api/web/lists/GetByTitle('Event Track Details')/Items",
"/_api/web/lists/GetByTitle('Event Track Details')/Items?$top=5000",
SPHttpClient.configurations.v1
)
.then((response1: SPHttpClientResponse) => {
Expand Down
2 changes: 1 addition & 1 deletion src/webparts/clbHome/components/ClbAddMember.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class ClbAddMember extends React.Component<IClbAddMemberProps, IState> {
private async _getListData(email: any): Promise<any> {
return this.props.context.spHttpClient
.get(
"/"+this.state.inclusionpath+"/"+this.state.sitename+ "/_api/web/lists/GetByTitle('Member List')/Items",
"/"+this.state.inclusionpath+"/"+this.state.sitename+ "/_api/web/lists/GetByTitle('Member List')/Items?$filter=Title eq '" + email.toLowerCase() +"'",
SPHttpClient.configurations.v1
)
.then(async (response: SPHttpClientResponse) => {
Expand Down
3 changes: 2 additions & 1 deletion src/webparts/clbHome/components/ClbChampionsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ class ClbChampionsList extends React.Component<IClbChampionsListProps, IState> {
this._getListData();
}

//Get Details of all members from Member List
private _getListData(): Promise<ISPLists> {
return this.props.context.spHttpClient
.get( "/"+this.state.inclusionpath+"/"+this.state.sitename+

"/_api/web/lists/GetByTitle('Member List')/Items",
"/_api/web/lists/GetByTitle('Member List')/Items?$top=1000",
SPHttpClient.configurations.v1
)
.then((response: SPHttpClientResponse) => {
Expand Down
Loading

0 comments on commit 73d7285

Please sign in to comment.