@plusscommunities/pluss-circles-web-groups 1.6.2-beta.0 → 1.6.2-beta.2

package/package.json

@@ -1,51 +1,47 @@
 {
 	"name": "@plusscommunities/pluss-circles-web-groups",
-	"version": "1.6.2-beta.0",
+	"version": "1.6.2-beta.2",
 	"description": "Extension package to enable circles on Pluss Communities Platform",
+	"main": "./dist/index.js",
 	"exports": {
 		".": "./dist/index.js"
 	},
+	"files": [
+		"dist/"
+	],
 	"scripts": {
-		"build": "npm i && rollup -c",
+		"build": "rollup -c",
+		"prepublishOnly": "(cd .. && npm install) && npm run build",
 		"betapatch": "npm version prepatch --preid=beta",
 		"patch": "npm version patch",
-		"betaupload": "npm run build && npm publish --access public --tag beta && rm -rf node_modules",
+		"betaupload": "npm publish --access public --tag beta",
 		"betaupload:p": "npm run betapatch && npm run betaupload",
-		"upload": "npm run build && npm publish --access public && rm -rf node_modules",
+		"upload": "npm publish --access public",
 		"upload:p": "npm run patch && npm run upload",
 		"copy:add": "run(){ ext=${1:-default}; test -f src/values.config.$ext.js || cp src/values.config.default.js src/values.config.$ext.js; }; run",
 		"copy:get": "echo $npm_package_name",
 		"copy:set": "run(){ target='\\@plusscommunities\\/pluss-circles-web'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f src/values.config.$ext.js && cp -f src/values.config.$ext.js src/values.config.js; sed -i'' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
-		"copy:betaupload": "npm run betapatch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
-		"copy:upload": "npm run patch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;"
+		"copy:betaupload": "for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
+		"copy:betaupload:p": "npm run betapatch; npm run copy:betaupload;",
+		"copy:upload": "for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
+		"copy:upload:p": "npm run patch; npm run copy:upload;"
 	},
 	"author": "Phillip Suh",
-	"license": "ISC",
-	"devDependencies": {
-		"@babel/cli": "^7.14.3",
-		"@babel/core": "^7.14.3",
-		"@babel/plugin-transform-runtime": "^7.14.3",
-		"@babel/preset-env": "^7.14.2",
-		"@babel/preset-react": "^7.13.13",
-		"@rollup/plugin-babel": "^5.3.0",
-		"@rollup/plugin-image": "^2.0.6",
-		"@rollup/plugin-json": "^4.1.0",
-		"autoprefixer": "^10.2.6",
-		"rollup": "^2.50.1",
-		"rollup-plugin-local-resolve": "^1.0.7",
-		"rollup-plugin-delete": "^3.0.2",
-		"rollup-plugin-styles": "^3.14.1"
-	},
 	"dependencies": {
 		"@babel/runtime": "^7.14.0"
 	},
 	"peerDependencies": {
 		"@plusscommunities/pluss-core-web": "*",
+		"@plusscommunities/pluss-icons": "*",
 		"lodash": "*",
 		"moment": "*",
 		"react": "*",
 		"react-bootstrap": "*",
-		"react-dom": "*"
+		"react-dom": "*",
+		"react-router": "*",
+		"react-router-dom": "*",
+		"react-redux": "*",
+		"react-fontawesome": "*"
 	},
 	"keywords": []
 }

package/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["@babel/preset-react", "@babel/preset-env"]
-}

package/rollup.config.js

@@ -1,59 +0,0 @@
-import styles from "rollup-plugin-styles";
-const autoprefixer = require("autoprefixer");
-import babel from "@rollup/plugin-babel";
-import json from "@rollup/plugin-json";
-import image from "@rollup/plugin-image";
-import resolve from "rollup-plugin-local-resolve";
-import del from "rollup-plugin-delete";
-
-const inputs = [{ input: "src/index.js", filename: "index" }];
-
-const config = inputs.map((entry, index) => ({
-	input: entry.input,
-	output: {
-		name: "@plusscommunities/pluss-core-web",
-		file: `dist/${entry.filename}.js`,
-		format: "esm",
-		exports: "auto",
-	},
-	external: [
-		"jquery",
-		"js-cookie",
-		"lodash",
-		"moment",
-		"react",
-		"react/jsx-runtime",
-		"react-router",
-		"react-csv",
-		"react-bootstrap",
-		"react-router-dom",
-		"react-dropzone",
-		"react-lottie",
-		"react-redux",
-		"react-textarea-autosize",
-		"aws-amplify",
-		"react-color",
-	],
-	plugins: [
-		index === 0 ? del({ targets: "dist", runOnce: true }) : null,
-		resolve({
-			extensions: [".js", ".jsx"],
-			browser: true,
-		}),
-		babel({
-			exclude: "node_modules/**",
-			presets: ["@babel/preset-react", "@babel/preset-env"],
-			plugins: ["@babel/transform-runtime"],
-			babelHelpers: "runtime",
-		}),
-		styles({
-			postcss: {
-				plugins: [autoprefixer()],
-			},
-		}),
-		image(),
-		json(),
-	].filter(Boolean),
-}));
-
-export default config;

package/src/actions/CirclesActions.js

@@ -1,23 +0,0 @@
-import _ from "lodash";
-import { CIRCLES_LOADED, CIRCLE_UPDATED, CIRCLE_REMOVED } from "./types";
-
-export const circlesLoaded = (circles) => {
-	return {
-		type: CIRCLES_LOADED,
-		payload: circles,
-	};
-};
-
-export const circleUpdated = (circle) => {
-	return {
-		type: CIRCLE_UPDATED,
-		payload: circle,
-	};
-};
-
-export const circleRemoved = (circleId) => {
-	return {
-		type: CIRCLE_REMOVED,
-		payload: circleId,
-	};
-};

package/src/actions/index.js

@@ -1 +0,0 @@
-export * from "./CirclesActions";

package/src/actions/types.js

@@ -1,5 +0,0 @@
-import { values } from "../values.config";
-
-export const CIRCLES_LOADED = `${values.actionCircleKey}S_LOADED`;
-export const CIRCLE_UPDATED = `${values.actionCircleKey}_UPDATED`;
-export const CIRCLE_REMOVED = `${values.actionCircleKey}_REMOVED`;

package/src/apis/circleActions.js

@@ -1,126 +0,0 @@
-import _ from "lodash";
-import { values } from "../values.config";
-import { PlussCore } from "../feature.config";
-const { Helper, Session } = PlussCore;
-
-export const circleActions = {
-	getAll: (site) => {
-		return Session.authedFunction({
-			method: "GET",
-			url: Helper.getUrl(values.serviceKey, "get/all", { site }),
-		});
-	},
-	getFiles: (circleId) => {
-		return Session.authedFunction({
-			method: "GET",
-			url: Helper.getUrl(values.serviceKey, "get/files", { circleId }),
-		});
-	},
-	getImages: (circleId) => {
-		return Session.authedFunction({
-			method: "GET",
-			url: Helper.getUrl(values.serviceKey, "get/images", { circleId }),
-		});
-	},
-	add: (site, title, image, audience, isPublic) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/add"),
-			data: {
-				site,
-				title,
-				image,
-				audience,
-				isPublic,
-			},
-		});
-	},
-	edit: (circleId, title, image, audience, isPublic) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/edit"),
-			data: {
-				circleId,
-				title,
-				image,
-				audience,
-				isPublic,
-			},
-		});
-	},
-	delete: (circleId) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/delete"),
-			data: {
-				circleId,
-			},
-		});
-	},
-	addAdmin: (circleId, userId) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/addadmin"),
-			data: {
-				circleId,
-				userId,
-			},
-		});
-	},
-	removeAdmin: (circleId, userId) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/removeadmin"),
-			data: {
-				circleId,
-				userId,
-			},
-		});
-	},
-	getMessages: async (groupId, limit, minTime, maxTime) => {
-		const query = { groupId };
-		if (!_.isUndefined(minTime)) {
-			query.minTime = minTime;
-		}
-		if (!_.isUndefined(maxTime)) {
-			query.maxTime = maxTime;
-		}
-		if (limit) {
-			query.limit = limit;
-		}
-		return Session.authedFunction({
-			method: "GET",
-			url: Helper.getUrl(values.serviceKey, "getMessages", query),
-		});
-	},
-	sendMessage: async (circleId, message) => {
-		return Session.authedFunction({
-			method: "post",
-			url: Helper.getUrl(values.serviceKey, "sendMessage"),
-			data: {
-				groupId: circleId,
-				message,
-			},
-		});
-	},
-	deleteMessage: async (messageId, groupId) => {
-		return Session.authedFunction({
-			method: "POST",
-			url: Helper.getUrl(values.serviceKey, "update/deletemessage"),
-			data: {
-				messageId,
-				groupId,
-			},
-		});
-	},
-	markAsRead: async (circleId, userId) => {
-		return Session.authedFunction({
-			method: "post",
-			url: Helper.getUrl("groups", "resetunread"),
-			data: {
-				groupID: circleId,
-				userID: userId,
-			},
-		});
-	},
-};

package/src/apis/index.js

@@ -1,7 +0,0 @@
-import { PlussCore } from "../feature.config";
-
-const { Apis } = PlussCore;
-
-export const analyticsActions = Apis.analyticsActions;
-
-export * from "./circleActions";

package/src/components/AnalyticsHub.js

@@ -1,284 +0,0 @@
-import React, { useState, useEffect } from "react";
-import moment from "moment";
-import { connect } from "react-redux";
-import { analyticsActions } from "../apis";
-import { values } from "../values.config";
-import { PlussCore } from "../feature.config";
-
-const { Analytics, Session, Components } = PlussCore;
-
-const getInitialState = () => ({
-	isLoading: true,
-	messages: 0,
-	prevMessages: 0,
-	staffMessages: 0,
-	prevStaffMessages: 0,
-	residentMessages: 0,
-	prevResidentMessages: 0,
-	groupMessages: 0,
-	prevGroupMessages: 0,
-	privateMessages: 0,
-	prevPrivateMessages: 0,
-	activeGroups: 0,
-	prevActiveGroups: 0,
-});
-
-// AnalyticsHub Component
-const AnalyticsHub = ({
-	startTime,
-	endTime,
-	auth,
-	prevText,
-	dayCount,
-	strings,
-}) => {
-	const [analyticsData, setAnalyticsData] = useState(getInitialState());
-	const [isExportOpen, setIsExportOpen] = useState(false);
-
-	const hasAccess = Session.validateAccess(
-		auth.site,
-		values.permissionNewsletter,
-		auth,
-	);
-	if (!hasAccess) {
-		return null;
-	}
-
-	const featureTitle = ((key) => {
-		if (!strings || !strings.sideNav || !strings.sideNav[key]) {
-			return values.textFeatureTitle;
-		}
-		return strings.sideNav[key];
-	})();
-
-	const exportColumns = [
-		{ label: "Select All", key: "" },
-		{ label: "Start Date", key: "startDate" },
-		{ label: "End Date", key: "endDate" },
-		{ label: "Messages", key: "messages" },
-		{ label: "Messages by Staff", key: "staffMessages" },
-		{ label: "Messages by Primary Users", key: "residentMessages" },
-		{ label: "Group Messages", key: "groupMessages" },
-		{ label: "Private Messages", key: "privateMessages" },
-		{ label: "Groups with Messages", key: "activeGroups" },
-	];
-
-	useEffect(() => {
-		getData();
-	}, [startTime, endTime]);
-
-	const getData = async () => {
-		setAnalyticsData(getInitialState());
-		// Load analytics data here using startTime and endTime
-		const timeDifference = endTime - startTime;
-		const [currentStatsResponse, prevStatsResponse] = await Promise.all([
-			analyticsActions.getAggregateEntityStats(
-				auth.site,
-				values.entityKey,
-				startTime,
-				endTime,
-				true,
-			),
-			analyticsActions.getAggregateEntityStats(
-				auth.site,
-				values.entityKey,
-				startTime - timeDifference,
-				startTime,
-				true,
-			),
-		]);
-
-		const data = {
-			messages: Analytics.countActivities(
-				currentStatsResponse.data,
-				"Message",
-				"total",
-			),
-			prevMessages: Analytics.countActivities(
-				prevStatsResponse.data,
-				"Message",
-				"total",
-			),
-			staffMessages: Analytics.countActivities(
-				currentStatsResponse.data,
-				"StaffMessage",
-				"total",
-			),
-			prevStaffMessages: Analytics.countActivities(
-				prevStatsResponse.data,
-				"StaffMessage",
-				"total",
-			),
-			residentMessages: Analytics.countActivities(
-				currentStatsResponse.data,
-				"ResidentMessage",
-				"total",
-			),
-			prevResidentMessages: Analytics.countActivities(
-				prevStatsResponse.data,
-				"ResidentMessage",
-				"total",
-			),
-			groupMessages: Analytics.countActivities(
-				currentStatsResponse.data,
-				"GroupMessage",
-				"total",
-			),
-			prevGroupMessages: Analytics.countActivities(
-				prevStatsResponse.data,
-				"GroupMessage",
-				"total",
-			),
-			privateMessages: Analytics.countActivities(
-				currentStatsResponse.data,
-				"PrivateMessage",
-				"total",
-			),
-			prevPrivateMessages: Analytics.countActivities(
-				prevStatsResponse.data,
-				"PrivateMessage",
-				"total",
-			),
-			activeGroups: Analytics.countActivities(
-				currentStatsResponse.data,
-				"GroupMessage",
-				"unique",
-			),
-			prevActiveGroups: Analytics.countActivities(
-				prevStatsResponse.data,
-				"GroupMessage",
-				"unique",
-			),
-			// uniquePageView: Analytics.countActivities(currentStatsResponse.data, 'UniquePageView', 'uniquearray'),
-			// prevUniquePageView: Analytics.countActivities(prevStatsResponse.data, 'UniquePageView', 'uniquearray'),
-			isLoading: false,
-		};
-		setAnalyticsData(data);
-	};
-
-	const isReadyToOpenCSV = () => {
-		return !analyticsData.isLoading;
-	};
-
-	const getExportSource = () => {
-		return [
-			{
-				startDate: moment(startTime + 1).format("D-MM-YYYY"),
-				endDate: moment(endTime).format("D-MM-YYYY"),
-				messages: analyticsData.messages,
-				staffMessages: analyticsData.staffMessages,
-				residentMessages: analyticsData.residentMessages,
-				groupMessages: analyticsData.groupMessages,
-				privateMessages: analyticsData.privateMessages,
-				activeGroups: analyticsData.activeGroups,
-			},
-		];
-	};
-
-	const csvPopup = () => {
-		if (!isExportOpen) {
-			return null;
-		}
-		const source = getExportSource();
-		return (
-			<Components.ExportCsvPopup
-				onClose={() => {
-					setIsExportOpen(false);
-				}}
-				columns={exportColumns}
-				source={source}
-				filename={`${values.analyticsKey}analytics_${source[0].startDate}_${source[0].endDate}.csv`}
-			/>
-		);
-	};
-
-	return (
-		<div className="dashboardSection">
-			{csvPopup()}
-			<div>
-				<Components.Text type="h4" className="inlineBlock marginRight-40">
-					{featureTitle}
-				</Components.Text>
-				<Components.Button
-					inline
-					buttonType="primaryAction"
-					onClick={() => {
-						if (!isReadyToOpenCSV()) return;
-						setIsExportOpen(true);
-					}}
-					isActive={isReadyToOpenCSV()}
-					leftIcon="file-code"
-				>
-					Export CSV
-				</Components.Button>
-			</div>
-			<div className="analyticsSection dashboardSection_content">
-				<Components.StatBox
-					title="Groups with Messages"
-					icon="fa-user-group"
-					value={analyticsData.activeGroups}
-					previousValue={analyticsData.prevActiveGroups}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=GroupMessage&countType=unique&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-				<Components.StatBox
-					title="Messages"
-					icon="fa-message"
-					value={analyticsData.messages}
-					previousValue={analyticsData.prevMessages}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=Message&countType=total&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-				<Components.StatBox
-					title="Messages by Staff"
-					icon="fa-user-tie"
-					value={analyticsData.staffMessages}
-					previousValue={analyticsData.prevStaffMessages}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=StaffMessage&countType=total&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-				<Components.StatBox
-					title="Messages by Primary Users"
-					icon="fa-users"
-					value={analyticsData.residentMessages}
-					previousValue={analyticsData.prevResidentMessages}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=ResidentMessage&countType=total&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-				<Components.StatBox
-					title="Group Messages"
-					icon="fa-users-rectangle"
-					value={analyticsData.groupMessages}
-					previousValue={analyticsData.prevGroupMessages}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=GroupMessage&countType=total&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-				<Components.StatBox
-					title="Private Messages"
-					icon="fa-people-arrows"
-					value={analyticsData.privateMessages}
-					previousValue={analyticsData.prevPrivateMessages}
-					prevText={prevText}
-					viewGraphLink={`/chart?entity=${values.entityKey}&startTime=${startTime}&endTime=${endTime}&key=PrivateMessage&countType=total&dayCount=${dayCount}`}
-					isLoading={analyticsData.isLoading}
-				/>
-			</div>
-		</div>
-	);
-};
-
-const mapStateToProps = (state) => {
-	const { auth } = state;
-	return {
-		auth,
-		strings: (state.strings && state.strings.config) || {},
-	};
-};
-
-const toExport = connect(mapStateToProps, {})(AnalyticsHub);
-export { toExport as AnalyticsHub };

package/src/components/FeaturePickerContent.js

@@ -1,47 +0,0 @@
-import React from "react";
-import { PlussCore } from "../feature.config";
-
-const { Components, Colours } = PlussCore;
-
-export default () => {
-	return (
-		<div className="fp2_widget_content fp2_widget_content-circles">
-			<div className="fp2_widget_content_vListing">
-				<div className="fp2_widget_silhouette fp2_widget_silhouette-circle">
-					<Components.Icon
-						icon={"fa-comments"}
-						colour={Colours.hexToRGBAstring(Colours.COLOUR_BRANDING_MAIN, 0.5)}
-					/>
-				</div>
-				<div className="flex-1">
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLine"></div>
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLineFull"></div>
-				</div>
-			</div>
-			<div className="fp2_widget_content_vListing">
-				<div className="fp2_widget_silhouette fp2_widget_silhouette-circle">
-					<Components.Icon
-						icon={"fa-comments"}
-						colour={Colours.hexToRGBAstring(Colours.COLOUR_BRANDING_MAIN, 0.5)}
-					/>
-				</div>
-				<div className="flex-1">
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLine"></div>
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLineFull"></div>
-				</div>
-			</div>
-			<div className="fp2_widget_content_vListing">
-				<div className="fp2_widget_silhouette fp2_widget_silhouette-circle">
-					<Components.Icon
-						icon={"fa-comments"}
-						colour={Colours.hexToRGBAstring(Colours.COLOUR_BRANDING_MAIN, 0.5)}
-					/>
-				</div>
-				<div className="flex-1">
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLine"></div>
-					<div className="fp2_widget_silhouette fp2_widget_silhouette-textLineFull"></div>
-				</div>
-			</div>
-		</div>
-	);
-};

package/src/components/PreviewFull.js

@@ -1,29 +0,0 @@
-import React, { Component } from "react";
-import fullNoTitle from "../images/fullNoTitle.png";
-
-class PreviewFull extends Component {
-	render() {
-		const { backgroundColor, widgetTitle, titleClassName } = this.props;
-		return (
-			<div style={styles.container}>
-				<p className={titleClassName}>{widgetTitle}</p>
-				<img
-					style={{ ...styles.image, backgroundColor }}
-					src={fullNoTitle}
-					alt="fullNoTitle"
-				/>
-			</div>
-		);
-	}
-}
-
-const styles = {
-	container: {
-		position: "relative",
-	},
-	image: {
-		width: "100%",
-	},
-};
-
-export default PreviewFull;