Issue #1685+Upgrade to 1.11.0 version
This commit is contained in:
parent
6c3f9bd5f9
commit
943d015a3f
|
@ -3,7 +3,14 @@
|
||||||
"name": "SPFx Modern Calendar",
|
"name": "SPFx Modern Calendar",
|
||||||
"id": "3d593a2f-73f1-486f-9dae-555c6f6b584d",
|
"id": "3d593a2f-73f1-486f-9dae-555c6f6b584d",
|
||||||
"version": "1.0.0.1",
|
"version": "1.0.0.1",
|
||||||
"includeClientSideAssets": true
|
"includeClientSideAssets": true,
|
||||||
|
"developer": {
|
||||||
|
"name": "",
|
||||||
|
"websiteUrl": "",
|
||||||
|
"privacyUrl": "",
|
||||||
|
"termsOfUseUrl": "",
|
||||||
|
"mpnId": ""
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"paths": {
|
"paths": {
|
||||||
"zippedPackage": "solution/modern-calendar.sppkg"
|
"zippedPackage": "solution/modern-calendar.sppkg"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,25 +2,30 @@
|
||||||
"name": "modern-calendar",
|
"name": "modern-calendar",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
"main": "lib/index.js",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@microsoft/sp-core-library": "1.6.0",
|
"@microsoft/sp-core-library": "1.11.0",
|
||||||
"@microsoft/sp-webpart-base": "1.6.0",
|
"@microsoft/sp-property-pane": "1.11.0",
|
||||||
|
"@microsoft/sp-webpart-base": "1.11.0",
|
||||||
"@types/fullcalendar": "^2.7.38",
|
"@types/fullcalendar": "^2.7.38",
|
||||||
"@types/moment": "^2.13.0",
|
"@types/moment": "^2.13.0",
|
||||||
"@types/webpack-env": ">=1.12.1 <1.14.0",
|
|
||||||
"fullcalendar": "3.9.0",
|
"fullcalendar": "3.9.0",
|
||||||
"sweetalert2": "^6.4.2"
|
"sweetalert2": "^6.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@microsoft/sp-build-web": "1.6.0",
|
"@microsoft/rush-stack-compiler-3.3": "0.3.5",
|
||||||
"@microsoft/sp-module-interfaces": "1.6.0",
|
"@microsoft/sp-build-web": "1.11.0",
|
||||||
"@microsoft/sp-webpart-workbench": "1.6.0",
|
"@microsoft/sp-module-interfaces": "1.11.0",
|
||||||
"gulp": "~3.9.1",
|
"@microsoft/sp-tslint-rules": "1.11.0",
|
||||||
|
"@microsoft/sp-webpart-workbench": "1.11.0",
|
||||||
"@types/chai": ">=3.4.34 <3.6.0",
|
"@types/chai": ">=3.4.34 <3.6.0",
|
||||||
"@types/mocha": ">=2.2.33 <2.6.0"
|
"@types/es6-promise": "0.0.33",
|
||||||
|
"@types/mocha": ">=2.2.33 <2.6.0",
|
||||||
|
"@types/webpack-env": "1.13.1",
|
||||||
|
"gulp": "~3.9.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "gulp bundle",
|
"build": "gulp bundle",
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import {
|
import styles from "./CalendarTemplate.module.scss";
|
||||||
IPropertyPaneDropdownOption
|
import { escape } from "@microsoft/sp-lodash-subset";
|
||||||
} from '@microsoft/sp-webpart-base';
|
import { IPropertyPaneDropdownOption } from "@microsoft/sp-property-pane";
|
||||||
import styles from './CalendarTemplate.module.scss';
|
|
||||||
import { escape } from '@microsoft/sp-lodash-subset';
|
|
||||||
|
|
||||||
export interface ISPLists {
|
export interface ISPLists {
|
||||||
value: ISPList[];
|
value: ISPList[];
|
||||||
|
@ -37,46 +35,63 @@ export default class CalendarTemplate {
|
||||||
public static themeBase: string = `https://code.jquery.com/ui/1.12.1/themes/`;
|
public static themeBase: string = `https://code.jquery.com/ui/1.12.1/themes/`;
|
||||||
|
|
||||||
public static themeNames: Array<string> = [
|
public static themeNames: Array<string> = [
|
||||||
'default',
|
"default",
|
||||||
'black-tie',
|
"black-tie",
|
||||||
'blitzer',
|
"blitzer",
|
||||||
'cupertino',
|
"cupertino",
|
||||||
'dark-hive',
|
"dark-hive",
|
||||||
'dot-luv',
|
"dot-luv",
|
||||||
'eggplant',
|
"eggplant",
|
||||||
'excite-bike',
|
"excite-bike",
|
||||||
'flick',
|
"flick",
|
||||||
'hot-sneaks',
|
"hot-sneaks",
|
||||||
'humanity',
|
"humanity",
|
||||||
'le-frog',
|
"le-frog",
|
||||||
'mint-choc',
|
"mint-choc",
|
||||||
'overcast',
|
"overcast",
|
||||||
'pcpro',
|
"pcpro",
|
||||||
'pepper-grinder',
|
"pepper-grinder",
|
||||||
'redmond',
|
"redmond",
|
||||||
'smoothness',
|
"smoothness",
|
||||||
'south-street',
|
"south-street",
|
||||||
'start',
|
"start",
|
||||||
'sunny',
|
"sunny",
|
||||||
'swanky-purse',
|
"swanky-purse",
|
||||||
'trontastic',
|
"trontastic",
|
||||||
'ui-darkness',
|
"ui-darkness",
|
||||||
'ui-lightness',
|
"ui-lightness",
|
||||||
'vader'
|
"vader",
|
||||||
];
|
];
|
||||||
|
|
||||||
public static theme(): IPropertyPaneDropdownOption[] {
|
public static theme(): IPropertyPaneDropdownOption[] {
|
||||||
var themes: IPropertyPaneDropdownOption[] = [];
|
var themes: IPropertyPaneDropdownOption[] = [];
|
||||||
CalendarTemplate.themeNames.forEach(function (name, index) {
|
CalendarTemplate.themeNames.forEach(function (name, index) {
|
||||||
themes.push({key: CalendarTemplate.themeBase + name + '/jquery-ui.min.css', text: name.toLocaleUpperCase()});
|
themes.push({
|
||||||
|
key: CalendarTemplate.themeBase + name + "/jquery-ui.min.css",
|
||||||
|
text: name.toLocaleUpperCase(),
|
||||||
|
});
|
||||||
});
|
});
|
||||||
return themes;
|
return themes;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static themes: IPropertyPaneDropdownOption[] = [
|
public static themes: IPropertyPaneDropdownOption[] = [
|
||||||
{ key: CalendarTemplate.themeBase + 'jquery-ui.theme.min.css', text: 'Default' },
|
{
|
||||||
{ key: CalendarTemplate.themeBase + 'ui-lightness/jquery-ui.min.css', text: 'Light' },
|
key: CalendarTemplate.themeBase + "jquery-ui.theme.min.css",
|
||||||
{ key: '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/redmond/jquery-ui.min.css', text: 'Redmond' },
|
text: "Default",
|
||||||
{ key: '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/overcast/jquery-ui.min.css', text: 'Overcast' }
|
},
|
||||||
|
{
|
||||||
|
key: CalendarTemplate.themeBase + "ui-lightness/jquery-ui.min.css",
|
||||||
|
text: "Light",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key:
|
||||||
|
"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/redmond/jquery-ui.min.css",
|
||||||
|
text: "Redmond",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key:
|
||||||
|
"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/overcast/jquery-ui.min.css",
|
||||||
|
text: "Overcast",
|
||||||
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
"componentType": "WebPart",
|
"componentType": "WebPart",
|
||||||
"version": "*",
|
"version": "*",
|
||||||
"manifestVersion": 2,
|
"manifestVersion": 2,
|
||||||
|
"supportedHosts": ["SharePointWebPart"],
|
||||||
"preconfiguredEntries": [{
|
"preconfiguredEntries": [{
|
||||||
"groupId": "c2a397d3-8c8f-47ab-b731-897178313c15",
|
"groupId": "c2a397d3-8c8f-47ab-b731-897178313c15",
|
||||||
"group": { "default": "Modern Web Parts" },
|
"group": { "default": "Modern Web Parts" },
|
||||||
|
|
|
@ -1,33 +1,29 @@
|
||||||
import { Version } from '@microsoft/sp-core-library';
|
import { BaseClientSideWebPart } from "@microsoft/sp-webpart-base";
|
||||||
import {
|
import {
|
||||||
BaseClientSideWebPart,
|
|
||||||
IPropertyPaneConfiguration,
|
IPropertyPaneConfiguration,
|
||||||
IPropertyPaneDropdownOption,
|
IPropertyPaneDropdownOption,
|
||||||
IPropertyPaneTextFieldProps,
|
IPropertyPaneTextFieldProps,
|
||||||
IWebPartContext,
|
|
||||||
PropertyPaneTextField,
|
PropertyPaneTextField,
|
||||||
PropertyPaneDropdown,
|
PropertyPaneDropdown,
|
||||||
IPropertyPaneDropdownProps
|
IPropertyPaneDropdownProps,
|
||||||
} from '@microsoft/sp-webpart-base';
|
} from "@microsoft/sp-property-pane";
|
||||||
import { escape } from '@microsoft/sp-lodash-subset';
|
|
||||||
import styles from './ModernCalendar.module.scss';
|
import { Version } from "@microsoft/sp-core-library";
|
||||||
import * as strings from 'modernCalendarStrings';
|
|
||||||
import { IModernCalendarWebPartProps } from './IModernCalendarWebPartProps';
|
import { escape } from "@microsoft/sp-lodash-subset";
|
||||||
import CalendarTemplate from './CalendarTemplate';
|
import styles from "./ModernCalendar.module.scss";
|
||||||
import * as jQuery from 'jquery';
|
import * as strings from "modernCalendarStrings";
|
||||||
import 'fullcalendar';
|
import { IModernCalendarWebPartProps } from "./IModernCalendarWebPartProps";
|
||||||
import * as moment from 'moment';
|
import CalendarTemplate from "./CalendarTemplate";
|
||||||
import * as swal2 from 'sweetalert2';
|
import * as jQuery from "jquery";
|
||||||
import { SPComponentLoader } from '@microsoft/sp-loader';
|
import "fullcalendar";
|
||||||
import {
|
import * as moment from "moment";
|
||||||
SPHttpClient, SPHttpClientResponse
|
import * as swal2 from "sweetalert2";
|
||||||
} from '@microsoft/sp-http';
|
import { SPComponentLoader } from "@microsoft/sp-loader";
|
||||||
import {
|
import { SPHttpClient, SPHttpClientResponse } from "@microsoft/sp-http";
|
||||||
Environment,
|
import { Environment, EnvironmentType } from "@microsoft/sp-core-library";
|
||||||
EnvironmentType
|
import { EventObjectInput, OptionsInput } from "fullcalendar";
|
||||||
} from '@microsoft/sp-core-library';
|
import { Default as View } from "fullcalendar/View";
|
||||||
import { EventObjectInput, OptionsInput } from 'fullcalendar';
|
|
||||||
import { Default as View } from 'fullcalendar/View';
|
|
||||||
|
|
||||||
export interface ISPLists {
|
export interface ISPLists {
|
||||||
value: ISPList[];
|
value: ISPList[];
|
||||||
|
@ -43,12 +39,15 @@ export interface EventObjects {
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModernCalendarWebPartProps> {
|
export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModernCalendarWebPartProps> {
|
||||||
|
|
||||||
public constructor() {
|
public constructor() {
|
||||||
super();
|
super();
|
||||||
// Modify with your a CDN or local path
|
// Modify with your a CDN or local path
|
||||||
SPComponentLoader.loadCss('https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/8.11.8/sweetalert2.min.css');
|
SPComponentLoader.loadCss(
|
||||||
SPComponentLoader.loadCss('https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.css');
|
"https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/8.11.8/sweetalert2.min.css"
|
||||||
|
);
|
||||||
|
SPComponentLoader.loadCss(
|
||||||
|
"https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.9.0/fullcalendar.min.css"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public render(): void {
|
public render(): void {
|
||||||
|
@ -57,12 +56,20 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.properties.other) {
|
if (!this.properties.other) {
|
||||||
jQuery('input[aria-label=hide-col]').parent().hide();
|
jQuery("input[aria-label=hide-col]").parent().hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Check required properties before rendering list
|
//Check required properties before rendering list
|
||||||
if (this.properties.listTitle == null || this.properties.start == null || this.properties.end == null || this.properties.title == null || this.properties.detail == null) {
|
if (
|
||||||
this.domElement.innerHTML = CalendarTemplate.emptyHtml(this.properties.description);
|
this.properties.listTitle == null ||
|
||||||
|
this.properties.start == null ||
|
||||||
|
this.properties.end == null ||
|
||||||
|
this.properties.title == null ||
|
||||||
|
this.properties.detail == null
|
||||||
|
) {
|
||||||
|
this.domElement.innerHTML = CalendarTemplate.emptyHtml(
|
||||||
|
this.properties.description
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
this.domElement.innerHTML = CalendarTemplate.templateHtml;
|
this.domElement.innerHTML = CalendarTemplate.templateHtml;
|
||||||
this._renderListAsync();
|
this._renderListAsync();
|
||||||
|
@ -70,7 +77,7 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
}
|
}
|
||||||
|
|
||||||
protected get dataVersion(): Version {
|
protected get dataVersion(): Version {
|
||||||
return Version.parse('1.0');
|
return Version.parse("1.0");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected onPropertyPaneConfigurationStart(): void {
|
protected onPropertyPaneConfigurationStart(): void {
|
||||||
|
@ -83,49 +90,79 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
this.listDisabled = false;
|
this.listDisabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.properties.listTitle && (!this.properties.start || !this.properties.end || !this.properties.title || !this.properties.detail)) {
|
if (
|
||||||
|
this.properties.listTitle &&
|
||||||
|
(!this.properties.start ||
|
||||||
|
!this.properties.end ||
|
||||||
|
!this.properties.title ||
|
||||||
|
!this.properties.detail)
|
||||||
|
) {
|
||||||
//this._getColumnsAsync();
|
//this._getColumnsAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.properties.other) {
|
if (!this.properties.other) {
|
||||||
jQuery('input[aria-label=hide-col]').parent().hide();
|
jQuery("input[aria-label=hide-col]").parent().hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.properties.site && this.properties.listTitle && this.properties.start && this.properties.start && this.properties.end && this.properties.title && this.properties.detail) {
|
if (
|
||||||
this.context.statusRenderer.displayLoadingIndicator(this.domElement, 'Configuration');
|
this.properties.site &&
|
||||||
this._getSiteRootWeb()
|
this.properties.listTitle &&
|
||||||
.then((response0) => {
|
this.properties.start &&
|
||||||
this._getSites(response0['Url'])
|
this.properties.start &&
|
||||||
.then((response) => {
|
this.properties.end &&
|
||||||
|
this.properties.title &&
|
||||||
|
this.properties.detail
|
||||||
|
) {
|
||||||
|
this.context.statusRenderer.displayLoadingIndicator(
|
||||||
|
this.domElement,
|
||||||
|
"Configuration"
|
||||||
|
);
|
||||||
|
this._getSiteRootWeb().then((response0) => {
|
||||||
|
this._getSites(response0["Url"]).then((response) => {
|
||||||
var sites: IPropertyPaneDropdownOption[] = [];
|
var sites: IPropertyPaneDropdownOption[] = [];
|
||||||
sites.push({ key: this.context.pageContext.web.absoluteUrl, text: 'This Site' });
|
sites.push({
|
||||||
sites.push({ key: 'other', text: 'Other Site (Specify Url)' });
|
key: this.context.pageContext.web.absoluteUrl,
|
||||||
|
text: "This Site",
|
||||||
|
});
|
||||||
|
sites.push({ key: "other", text: "Other Site (Specify Url)" });
|
||||||
for (var _key in response.value) {
|
for (var _key in response.value) {
|
||||||
if (this.context.pageContext.web.absoluteUrl != response.value[_key]['Url']) {
|
if (
|
||||||
sites.push({ key: response.value[_key]['Url'], text: response.value[_key]['Title'] });
|
this.context.pageContext.web.absoluteUrl !=
|
||||||
|
response.value[_key]["Url"]
|
||||||
|
) {
|
||||||
|
sites.push({
|
||||||
|
key: response.value[_key]["Url"],
|
||||||
|
text: response.value[_key]["Title"],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this._siteOptions = sites;
|
this._siteOptions = sites;
|
||||||
if (this.properties.site) {
|
if (this.properties.site) {
|
||||||
this._getListTitles(this.properties.site)
|
this._getListTitles(this.properties.site).then((response2) => {
|
||||||
.then((response2) => {
|
|
||||||
this._dropdownOptions = response2.value.map((list: ISPList) => {
|
this._dropdownOptions = response2.value.map((list: ISPList) => {
|
||||||
return {
|
return {
|
||||||
key: list.Title,
|
key: list.Title,
|
||||||
text: list.Title
|
text: list.Title,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
this._getListColumns(this.properties.listTitle, this.properties.site)
|
this._getListColumns(
|
||||||
.then((response3) => {
|
this.properties.listTitle,
|
||||||
|
this.properties.site
|
||||||
|
).then((response3) => {
|
||||||
var col: IPropertyPaneDropdownOption[] = [];
|
var col: IPropertyPaneDropdownOption[] = [];
|
||||||
for (var _key in response3.value) {
|
for (var _key in response3.value) {
|
||||||
col.push({ key: response3.value[_key]['InternalName'], text: response3.value[_key]['Title'] });
|
col.push({
|
||||||
|
key: response3.value[_key]["InternalName"],
|
||||||
|
text: response3.value[_key]["Title"],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
this._columnOptions = col;
|
this._columnOptions = col;
|
||||||
this.colsDisabled = false;
|
this.colsDisabled = false;
|
||||||
this.listDisabled = false;
|
this.listDisabled = false;
|
||||||
this.context.propertyPane.refresh();
|
this.context.propertyPane.refresh();
|
||||||
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
this.context.statusRenderer.clearLoadingIndicator(
|
||||||
|
this.domElement
|
||||||
|
);
|
||||||
this.render();
|
this.render();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -137,30 +174,43 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected onPropertyPaneFieldChanged(propertyPath: string, oldValue: any, newValue: any): void {
|
protected onPropertyPaneFieldChanged(
|
||||||
if (newValue == 'other') {
|
propertyPath: string,
|
||||||
|
oldValue: any,
|
||||||
|
newValue: any
|
||||||
|
): void {
|
||||||
|
if (newValue == "other") {
|
||||||
this.properties.other = true;
|
this.properties.other = true;
|
||||||
this.properties.listTitle = null;
|
this.properties.listTitle = null;
|
||||||
jQuery('input[aria-label=hide-col]').parent().show();
|
jQuery("input[aria-label=hide-col]").parent().show();
|
||||||
} else if (oldValue === 'other' && newValue != 'other') {
|
} else if (oldValue === "other" && newValue != "other") {
|
||||||
this.properties.other = false;
|
this.properties.other = false;
|
||||||
this.properties.siteOther = null;
|
this.properties.siteOther = null;
|
||||||
this.properties.listTitle = null;
|
this.properties.listTitle = null;
|
||||||
jQuery('input[aria-label=hide-col]').parent().hide();
|
jQuery("input[aria-label=hide-col]").parent().hide();
|
||||||
}
|
}
|
||||||
this.context.statusRenderer.displayLoadingIndicator(this.domElement, 'Configuration');
|
this.context.statusRenderer.displayLoadingIndicator(
|
||||||
if ((propertyPath === 'site' || propertyPath === 'siteOther') && newValue) {
|
this.domElement,
|
||||||
|
"Configuration"
|
||||||
|
);
|
||||||
|
if ((propertyPath === "site" || propertyPath === "siteOther") && newValue) {
|
||||||
this.colsDisabled = true;
|
this.colsDisabled = true;
|
||||||
this.listDisabled = true;
|
this.listDisabled = true;
|
||||||
var siteUrl = newValue;
|
var siteUrl = newValue;
|
||||||
if (this.properties.other) { siteUrl = this.properties.siteOther; } else { jQuery('input[aria-label=hide-col]').parent().hide(); }
|
if (this.properties.other) {
|
||||||
if ((this.properties.other && this.properties.siteOther.length > 25) || !this.properties.other) {
|
siteUrl = this.properties.siteOther;
|
||||||
this._getListTitles(siteUrl)
|
} else {
|
||||||
.then((response) => {
|
jQuery("input[aria-label=hide-col]").parent().hide();
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
(this.properties.other && this.properties.siteOther.length > 25) ||
|
||||||
|
!this.properties.other
|
||||||
|
) {
|
||||||
|
this._getListTitles(siteUrl).then((response) => {
|
||||||
this._dropdownOptions = response.value.map((list: ISPList) => {
|
this._dropdownOptions = response.value.map((list: ISPList) => {
|
||||||
return {
|
return {
|
||||||
key: list.Title,
|
key: list.Title,
|
||||||
text: list.Title
|
text: list.Title,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
this.listDisabled = false;
|
this.listDisabled = false;
|
||||||
|
@ -169,15 +219,19 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
this.render();
|
this.render();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (propertyPath === 'listTitle' && newValue) {
|
} else if (propertyPath === "listTitle" && newValue) {
|
||||||
// tslint:disable-next-line:no-duplicate-variable
|
// tslint:disable-next-line:no-duplicate-variable
|
||||||
var siteUrl = newValue;
|
var siteUrl = newValue;
|
||||||
if (this.properties.other) { siteUrl = this.properties.siteOther; }
|
if (this.properties.other) {
|
||||||
this._getListColumns(newValue, siteUrl)
|
siteUrl = this.properties.siteOther;
|
||||||
.then((response) => {
|
}
|
||||||
|
this._getListColumns(newValue, siteUrl).then((response) => {
|
||||||
var col: IPropertyPaneDropdownOption[] = [];
|
var col: IPropertyPaneDropdownOption[] = [];
|
||||||
for (var _key in response.value) {
|
for (var _key in response.value) {
|
||||||
col.push({ key: response.value[_key]['InternalName'], text: response.value[_key]['Title'] });
|
col.push({
|
||||||
|
key: response.value[_key]["InternalName"],
|
||||||
|
text: response.value[_key]["Title"],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
this._columnOptions = col;
|
this._columnOptions = col;
|
||||||
this.colsDisabled = false;
|
this.colsDisabled = false;
|
||||||
|
@ -195,63 +249,66 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
private listDisabled: boolean = true;
|
private listDisabled: boolean = true;
|
||||||
|
|
||||||
protected getPropertyPaneConfiguration(): IPropertyPaneConfiguration {
|
protected getPropertyPaneConfiguration(): IPropertyPaneConfiguration {
|
||||||
var otherSiteAria = 'hide-col';
|
var otherSiteAria = "hide-col";
|
||||||
if (this.properties.other) { otherSiteAria = ''; }
|
if (this.properties.other) {
|
||||||
|
otherSiteAria = "";
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
pages: [
|
pages: [
|
||||||
{
|
{
|
||||||
header: {
|
header: {
|
||||||
description: strings.PropertyPaneDescription
|
description: strings.PropertyPaneDescription,
|
||||||
},
|
},
|
||||||
groups: [
|
groups: [
|
||||||
{
|
{
|
||||||
groupName: strings.BasicGroupName,
|
groupName: strings.BasicGroupName,
|
||||||
groupFields: [
|
groupFields: [
|
||||||
PropertyPaneTextField('description', {
|
PropertyPaneTextField("description", {
|
||||||
label: strings.DescriptionFieldLabel
|
label: strings.DescriptionFieldLabel,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('theme', {
|
PropertyPaneDropdown("theme", {
|
||||||
label: 'Theme',
|
label: "Theme",
|
||||||
options: CalendarTemplate.theme()
|
options: CalendarTemplate.theme(),
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('site', {
|
PropertyPaneDropdown("site", {
|
||||||
label: 'Site',
|
label: "Site",
|
||||||
options: this._siteOptions
|
options: this._siteOptions,
|
||||||
}),
|
}),
|
||||||
PropertyPaneTextField('siteOther', {
|
PropertyPaneTextField("siteOther", {
|
||||||
label: 'Other Site Url (i.e. https://contoso.sharepoint.com/path)',
|
label:
|
||||||
ariaLabel: otherSiteAria
|
"Other Site Url (i.e. https://contoso.sharepoint.com/path)",
|
||||||
|
ariaLabel: otherSiteAria,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('listTitle', {
|
PropertyPaneDropdown("listTitle", {
|
||||||
label: 'List Title',
|
label: "List Title",
|
||||||
options: this._dropdownOptions,
|
options: this._dropdownOptions,
|
||||||
disabled: this.listDisabled
|
disabled: this.listDisabled,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('start', {
|
PropertyPaneDropdown("start", {
|
||||||
label: 'Start Date Field',
|
label: "Start Date Field",
|
||||||
options: this._columnOptions,
|
options: this._columnOptions,
|
||||||
disabled: this.colsDisabled
|
disabled: this.colsDisabled,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('end', {
|
PropertyPaneDropdown("end", {
|
||||||
label: 'End Date Field',
|
label: "End Date Field",
|
||||||
options: this._columnOptions,
|
options: this._columnOptions,
|
||||||
disabled: this.colsDisabled
|
disabled: this.colsDisabled,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('title', {
|
PropertyPaneDropdown("title", {
|
||||||
label: 'Event Title Field',
|
label: "Event Title Field",
|
||||||
options: this._columnOptions,
|
options: this._columnOptions,
|
||||||
disabled: this.colsDisabled
|
disabled: this.colsDisabled,
|
||||||
}),
|
}),
|
||||||
PropertyPaneDropdown('detail', {
|
PropertyPaneDropdown("detail", {
|
||||||
label: 'Event Details',
|
label: "Event Details",
|
||||||
options: this._columnOptions,
|
options: this._columnOptions,
|
||||||
disabled: this.colsDisabled
|
disabled: this.colsDisabled,
|
||||||
})
|
}),
|
||||||
]
|
],
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,35 +322,67 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getSiteRootWeb(): Promise<ISPLists> {
|
private _getSiteRootWeb(): Promise<ISPLists> {
|
||||||
return this.context.spHttpClient.get(this.context.pageContext.web.absoluteUrl + `/_api/Site/RootWeb?$select=Title,Url`, SPHttpClient.configurations.v1)
|
return this.context.spHttpClient
|
||||||
|
.get(
|
||||||
|
this.context.pageContext.web.absoluteUrl +
|
||||||
|
`/_api/Site/RootWeb?$select=Title,Url`,
|
||||||
|
SPHttpClient.configurations.v1
|
||||||
|
)
|
||||||
.then((response: SPHttpClientResponse) => {
|
.then((response: SPHttpClientResponse) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getSites(rootWebUrl: string): Promise<ISPLists> {
|
private _getSites(rootWebUrl: string): Promise<ISPLists> {
|
||||||
return this.context.spHttpClient.get(rootWebUrl + `/_api/web/webs?$select=Title,Url`, SPHttpClient.configurations.v1)
|
return this.context.spHttpClient
|
||||||
|
.get(
|
||||||
|
rootWebUrl + `/_api/web/webs?$select=Title,Url`,
|
||||||
|
SPHttpClient.configurations.v1
|
||||||
|
)
|
||||||
.then((response: SPHttpClientResponse) => {
|
.then((response: SPHttpClientResponse) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getListTitles(site: string): Promise<ISPLists> {
|
private _getListTitles(site: string): Promise<ISPLists> {
|
||||||
return this.context.spHttpClient.get(site + `/_api/web/lists?$filter=Hidden eq false and BaseType eq 0`, SPHttpClient.configurations.v1)
|
return this.context.spHttpClient
|
||||||
|
.get(
|
||||||
|
site + `/_api/web/lists?$filter=Hidden eq false and BaseType eq 0`,
|
||||||
|
SPHttpClient.configurations.v1
|
||||||
|
)
|
||||||
.then((response: SPHttpClientResponse) => {
|
.then((response: SPHttpClientResponse) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getListColumns(listNameColumns: string, listsite: string): Promise<any> {
|
private _getListColumns(
|
||||||
return this.context.spHttpClient.get(listsite + `/_api/web/lists/GetByTitle('${listNameColumns}')/Fields?$filter=Hidden eq false and ReadOnlyField eq false`, SPHttpClient.configurations.v1)
|
listNameColumns: string,
|
||||||
|
listsite: string
|
||||||
|
): Promise<any> {
|
||||||
|
return this.context.spHttpClient
|
||||||
|
.get(
|
||||||
|
listsite +
|
||||||
|
`/_api/web/lists/GetByTitle('${listNameColumns}')/Fields?$filter=Hidden eq false and ReadOnlyField eq false`,
|
||||||
|
SPHttpClient.configurations.v1
|
||||||
|
)
|
||||||
.then((response: SPHttpClientResponse) => {
|
.then((response: SPHttpClientResponse) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getListData(listName: string, site: string): Promise<any> {
|
private _getListData(listName: string, site: string): Promise<any> {
|
||||||
return this.context.spHttpClient.get(site + `/_api/web/lists/GetByTitle('${listName}')/items?$select=${encodeURIComponent(this.properties.title)},${encodeURIComponent(this.properties.start)},${encodeURIComponent(this.properties.end)},${encodeURIComponent(this.properties.detail)},Created,Author/ID,Author/Title&$expand=Author/ID,Author/Title&$orderby=Id desc&$limit=500`, SPHttpClient.configurations.v1)
|
return this.context.spHttpClient
|
||||||
|
.get(
|
||||||
|
site +
|
||||||
|
`/_api/web/lists/GetByTitle('${listName}')/items?$select=${encodeURIComponent(
|
||||||
|
this.properties.title
|
||||||
|
)},${encodeURIComponent(this.properties.start)},${encodeURIComponent(
|
||||||
|
this.properties.end
|
||||||
|
)},${encodeURIComponent(
|
||||||
|
this.properties.detail
|
||||||
|
)},Created,Author/ID,Author/Title&$expand=Author/ID,Author/Title&$orderby=Id desc&$limit=500`,
|
||||||
|
SPHttpClient.configurations.v1
|
||||||
|
)
|
||||||
.then((response: SPHttpClientResponse) => {
|
.then((response: SPHttpClientResponse) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
|
@ -305,8 +394,8 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
title: list[this.properties.title],
|
title: list[this.properties.title],
|
||||||
start: list[this.properties.start],
|
start: list[this.properties.start],
|
||||||
end: list[this.properties.end],
|
end: list[this.properties.end],
|
||||||
id: list['Id'],
|
id: list["Id"],
|
||||||
detail: list[this.properties.detail]
|
detail: list[this.properties.detail],
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
||||||
|
@ -315,49 +404,66 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
theme: true,
|
theme: true,
|
||||||
events: calItems,
|
events: calItems,
|
||||||
eventClick: (_event) => {
|
eventClick: (_event) => {
|
||||||
var eventDetail = moment(_event['start']).format('MM/DD/YYYY hh:mm') + ' - ' + moment(_event['end']).format('MM/DD/YYYY hh:mm') + '<br>' + _event['detail'];
|
var eventDetail =
|
||||||
swal2.default(_event.title, eventDetail, 'info');
|
moment(_event["start"]).format("MM/DD/YYYY hh:mm") +
|
||||||
}
|
" - " +
|
||||||
|
moment(_event["end"]).format("MM/DD/YYYY hh:mm") +
|
||||||
|
"<br>" +
|
||||||
|
_event["detail"];
|
||||||
|
swal2.default(_event.title, eventDetail, "info");
|
||||||
|
},
|
||||||
};
|
};
|
||||||
jQuery('.spfxcalendar', this.domElement).fullCalendar(calendarOptions);
|
jQuery(".spfxcalendar", this.domElement).fullCalendar(calendarOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getSitesAsync(): void {
|
private _getSitesAsync(): void {
|
||||||
this._getSiteRootWeb()
|
this._getSiteRootWeb().then((response) => {
|
||||||
.then((response) => {
|
this._getSites(response["Url"]).then((response1) => {
|
||||||
this._getSites(response['Url'])
|
|
||||||
.then((response1) => {
|
|
||||||
var sites: IPropertyPaneDropdownOption[] = [];
|
var sites: IPropertyPaneDropdownOption[] = [];
|
||||||
sites.push({ key: this.context.pageContext.web.absoluteUrl, text: 'This Site' });
|
sites.push({
|
||||||
sites.push({ key: 'other', text: 'Other Site (Specify Url)' });
|
key: this.context.pageContext.web.absoluteUrl,
|
||||||
|
text: "This Site",
|
||||||
|
});
|
||||||
|
sites.push({ key: "other", text: "Other Site (Specify Url)" });
|
||||||
for (var _key in response1.value) {
|
for (var _key in response1.value) {
|
||||||
sites.push({ key: response1.value[_key]['Url'], text: response1.value[_key]['Title'] });
|
sites.push({
|
||||||
|
key: response1.value[_key]["Url"],
|
||||||
|
text: response1.value[_key]["Title"],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
this._siteOptions = sites;
|
this._siteOptions = sites;
|
||||||
this.context.propertyPane.refresh();
|
this.context.propertyPane.refresh();
|
||||||
var siteUrl = this.properties.site;
|
var siteUrl = this.properties.site;
|
||||||
if (this.properties.other) { siteUrl = this.properties.siteOther; }
|
if (this.properties.other) {
|
||||||
this._getListTitles(siteUrl)
|
siteUrl = this.properties.siteOther;
|
||||||
.then((response2) => {
|
}
|
||||||
|
this._getListTitles(siteUrl).then((response2) => {
|
||||||
this._dropdownOptions = response2.value.map((list: ISPList) => {
|
this._dropdownOptions = response2.value.map((list: ISPList) => {
|
||||||
return {
|
return {
|
||||||
key: list.Title,
|
key: list.Title,
|
||||||
text: list.Title
|
text: list.Title,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
this.context.propertyPane.refresh();
|
this.context.propertyPane.refresh();
|
||||||
if (this.properties.listTitle) {
|
if (this.properties.listTitle) {
|
||||||
this._getListColumns(this.properties.listTitle, this.properties.site)
|
this._getListColumns(
|
||||||
.then((response3) => {
|
this.properties.listTitle,
|
||||||
|
this.properties.site
|
||||||
|
).then((response3) => {
|
||||||
var col: IPropertyPaneDropdownOption[] = [];
|
var col: IPropertyPaneDropdownOption[] = [];
|
||||||
for (var _key in response3.value) {
|
for (var _key in response3.value) {
|
||||||
col.push({ key: response3.value[_key]['InternalName'], text: response3.value[_key]['Title'] });
|
col.push({
|
||||||
|
key: response3.value[_key]["InternalName"],
|
||||||
|
text: response3.value[_key]["Title"],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
this._columnOptions = col;
|
this._columnOptions = col;
|
||||||
this.colsDisabled = false;
|
this.colsDisabled = false;
|
||||||
this.listDisabled = false;
|
this.listDisabled = false;
|
||||||
this.context.propertyPane.refresh();
|
this.context.propertyPane.refresh();
|
||||||
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
this.context.statusRenderer.clearLoadingIndicator(
|
||||||
|
this.domElement
|
||||||
|
);
|
||||||
this.render();
|
this.render();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -366,16 +472,21 @@ export default class ModernCalendarWebPart extends BaseClientSideWebPart<IModern
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private _renderListAsync(): void {
|
private _renderListAsync(): void {
|
||||||
var siteUrl = this.properties.site;
|
var siteUrl = this.properties.site;
|
||||||
if (this.properties.other) { siteUrl = this.properties.siteOther; }
|
if (this.properties.other) {
|
||||||
this._getListData(this.properties.listTitle, siteUrl).then((response) => {
|
siteUrl = this.properties.siteOther;
|
||||||
|
}
|
||||||
|
this._getListData(this.properties.listTitle, siteUrl)
|
||||||
|
.then((response) => {
|
||||||
this._renderList(response.value);
|
this._renderList(response.value);
|
||||||
}).catch((err) => {
|
})
|
||||||
|
.catch((err) => {
|
||||||
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
this.context.statusRenderer.clearLoadingIndicator(this.domElement);
|
||||||
this.context.statusRenderer.renderError(this.domElement, "There was an error loading your list, please verify the selected list has Calendar Events or choose a new list.");
|
this.context.statusRenderer.renderError(
|
||||||
|
this.domElement,
|
||||||
|
"There was an error loading your list, please verify the selected list has Calendar Events or choose a new list."
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
"extends": "./node_modules/@microsoft/rush-stack-compiler-3.3/includes/tsconfig-web.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es5",
|
"target": "es5",
|
||||||
"forceConsistentCasingInFileNames": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
@ -8,8 +9,11 @@
|
||||||
"declaration": true,
|
"declaration": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
|
"inlineSources": false,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"outDir": "lib",
|
"outDir": "lib",
|
||||||
|
"strictNullChecks": false,
|
||||||
|
"noUnusedLocals": false,
|
||||||
"typeRoots": [
|
"typeRoots": [
|
||||||
"./node_modules/@types",
|
"./node_modules/@types",
|
||||||
"./node_modules/@microsoft"
|
"./node_modules/@microsoft"
|
||||||
|
@ -25,7 +29,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"include": [
|
"include": [
|
||||||
"src/**/*.ts"
|
"src/**/*.ts",
|
||||||
|
"src/**/*.tsx"
|
||||||
],
|
],
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|
Loading…
Reference in New Issue