-
+
+
+ {this.state.isPanelVisible && (
+
+
+
+ )}
+
+
diff --git a/src/dashboard/Data/Browser/Databrowser.scss b/src/dashboard/Data/Browser/Databrowser.scss
new file mode 100644
index 0000000000..112306c2b7
--- /dev/null
+++ b/src/dashboard/Data/Browser/Databrowser.scss
@@ -0,0 +1,25 @@
+.resizablePanel{
+ position: fixed;
+ top: 96px;
+ right: 0;
+ bottom: 0px;
+ :global(.react-resizable-handle) {
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ width: 10px;
+ cursor: col-resize;
+ box-shadow: -3px 0 3px -1px rgba(203, 203, 203, 0.2);
+ user-select: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ }
+}
+
+.aggregationPanelContainer{
+ height: 100%;
+ overflow: auto;
+ background-color: #fefafb;
+}
diff --git a/src/dashboard/Data/Browser/ObjectPickerDialog.react.js b/src/dashboard/Data/Browser/ObjectPickerDialog.react.js
index 710939ae44..f77ccf5cd4 100644
--- a/src/dashboard/Data/Browser/ObjectPickerDialog.react.js
+++ b/src/dashboard/Data/Browser/ObjectPickerDialog.react.js
@@ -97,7 +97,7 @@ export default class ObjectPickerDialog extends React.Component {
async fetchParseData(source, filters) {
const { useMasterKey } = this.props;
- const query = queryFromFilters(source, filters);
+ const query = await queryFromFilters(source, filters);
const sortDir = this.state.ordering[0] === '-' ? '-' : '+';
const field = this.state.ordering.substr(sortDir === '-' ? 1 : 0);
@@ -117,21 +117,21 @@ export default class ObjectPickerDialog extends React.Component {
async fetchParseDataCount(source, filters) {
const { useMasterKey } = this.props;
- const query = queryFromFilters(source, filters);
+ const query = await queryFromFilters(source, filters);
const count = await query.count({ useMasterKey });
return count;
}
- fetchNextPage() {
+ async fetchNextPage() {
if (!this.state.data) {
return null;
}
const className = this.props.className;
const source = this.state.relation || className;
- let query = queryFromFilters(source, this.state.filters);
+ let query = await queryFromFilters(source, this.state.filters);
if (this.state.ordering !== '-createdAt') {
// Construct complex pagination query
- const equalityQuery = queryFromFilters(source, this.state.filters);
+ const equalityQuery = await queryFromFilters(source, this.state.filters);
let field = this.state.ordering;
let ascending = true;
let comp = this.state.data[this.state.data.length - 1].get(field);
diff --git a/src/dashboard/Data/Config/Config.react.js b/src/dashboard/Data/Config/Config.react.js
index 148cc2042f..c130791561 100644
--- a/src/dashboard/Data/Config/Config.react.js
+++ b/src/dashboard/Data/Config/Config.react.js
@@ -20,9 +20,11 @@ import TableHeader from 'components/Table/TableHeader.react';
import TableView from 'dashboard/TableView.react';
import Toolbar from 'components/Toolbar/Toolbar.react';
import browserStyles from 'dashboard/Data/Browser/Browser.scss';
+import { CurrentApp } from 'context/currentApp';
@subscribeTo('Config', 'config')
class Config extends TableView {
+ static contextType = CurrentApp;
constructor() {
super();
this.section = 'Core';
@@ -242,7 +244,7 @@ class Config extends TableView {
return data;
}
- saveParam({ name, value, masterKeyOnly }) {
+ saveParam({ name, value, type, masterKeyOnly }) {
this.props.config
.dispatch(ActionTypes.SET, {
param: name,
@@ -252,6 +254,32 @@ class Config extends TableView {
.then(
() => {
this.setState({ modalOpen: false });
+ const limit = this.context.cloudConfigHistoryLimit;
+ const applicationId = this.context.applicationId;
+ let transformedValue = value;
+ if(type === 'Date') {
+ transformedValue = {__type: 'Date', iso: value};
+ }
+ if(type === 'File') {
+ transformedValue = {name: value._name, url: value._url};
+ }
+ const configHistory = localStorage.getItem(`${applicationId}_configHistory`);
+ if(!configHistory) {
+ localStorage.setItem(`${applicationId}_configHistory`, JSON.stringify({
+ [name]: [{
+ time: new Date(),
+ value: transformedValue
+ }]
+ }));
+ } else {
+ const oldConfigHistory = JSON.parse(configHistory);
+ localStorage.setItem(`${applicationId}_configHistory`, JSON.stringify({
+ ...oldConfigHistory,
+ [name]: !oldConfigHistory[name] ?
+ [{time: new Date(), value: transformedValue}]
+ : [{time: new Date(), value: transformedValue}, ...oldConfigHistory[name]].slice(0, limit || 100)
+ }));
+ }
},
() => {
// Catch the error
@@ -263,6 +291,15 @@ class Config extends TableView {
this.props.config.dispatch(ActionTypes.DELETE, { param: name }).then(() => {
this.setState({ showDeleteParameterDialog: false });
});
+ const configHistory = localStorage.getItem('configHistory') && JSON.parse(localStorage.getItem('configHistory'));
+ if(configHistory) {
+ delete configHistory[name];
+ if(Object.keys(configHistory).length === 0) {
+ localStorage.removeItem('configHistory');
+ } else {
+ localStorage.setItem('configHistory', JSON.stringify(configHistory));
+ }
+ }
}
createParameter() {
diff --git a/src/dashboard/Data/Config/ConfigDialog.react.js b/src/dashboard/Data/Config/ConfigDialog.react.js
index 711b66efe0..447ba6a2a8 100644
--- a/src/dashboard/Data/Config/ConfigDialog.react.js
+++ b/src/dashboard/Data/Config/ConfigDialog.react.js
@@ -20,6 +20,8 @@ import Toggle from 'components/Toggle/Toggle.react';
import validateNumeric from 'lib/validateNumeric';
import styles from 'dashboard/Data/Browser/Browser.scss';
import semver from 'semver/preload.js';
+import { dateStringUTC } from 'lib/DateUtils';
+import { CurrentApp } from 'context/currentApp';
const PARAM_TYPES = ['Boolean', 'String', 'Number', 'Date', 'Object', 'Array', 'GeoPoint', 'File'];
@@ -90,6 +92,7 @@ const GET_VALUE = {
};
export default class ConfigDialog extends React.Component {
+ static contextType = CurrentApp;
constructor(props) {
super();
this.state = {
@@ -97,6 +100,7 @@ export default class ConfigDialog extends React.Component {
type: 'String',
name: '',
masterKeyOnly: false,
+ selectedIndex: null,
};
if (props.param.length > 0) {
this.state = {
@@ -104,6 +108,7 @@ export default class ConfigDialog extends React.Component {
type: props.type,
value: props.value,
masterKeyOnly: props.masterKeyOnly,
+ selectedIndex: 0,
};
}
}
@@ -169,6 +174,7 @@ export default class ConfigDialog extends React.Component {
submit() {
this.props.onConfirm({
name: this.state.name,
+ type: this.state.type,
value: GET_VALUE[this.state.type](this.state.value),
masterKeyOnly: this.state.masterKeyOnly,
});
@@ -190,6 +196,28 @@ export default class ConfigDialog extends React.Component {
))}
);
+ const configHistory = localStorage.getItem(`${this.context.applicationId}_configHistory`) && JSON.parse(localStorage.getItem(`${this.context.applicationId}_configHistory`))[this.state.name];
+ const handleIndexChange = index => {
+ if(this.state.type === 'Date'){
+ return;
+ }
+ let value = configHistory[index].value;
+ if(this.state.type === 'File'){
+ const fileJSON = {
+ __type: 'File',
+ name: value.name,
+ url: value.url
+ };
+ const file = Parse.File.fromJSON(fileJSON);
+ this.setState({ selectedIndex: index, value: file });
+ return;
+ }
+ if(typeof value === 'object'){
+ value = JSON.stringify(value);
+ }
+ this.setState({ selectedIndex: index, value });
+ };
+
return (
) : null
}
+ {
+ configHistory?.length > 0 &&
+
+ }
+ input={
+
+ {configHistory.map((value, i) =>
+
+ )}
+
+ }
+ className={styles.addColumnToggleWrapper}
+ />
+ }
);
}
diff --git a/src/dashboard/Push/PushAudiencesData.react.js b/src/dashboard/Push/PushAudiencesData.react.js
index 49dd66ae94..93654c7497 100644
--- a/src/dashboard/Push/PushAudiencesData.react.js
+++ b/src/dashboard/Push/PushAudiencesData.react.js
@@ -117,13 +117,13 @@ export default class PushAudiencesData extends React.Component {
* @param {[type]} options.saveForFuture [description]
* @return {[type]} [description]
*/
- createAudience(modalState, { platforms, name, formattedFilters, saveForFuture, filters }) {
+ async createAudience(modalState, { platforms, name, formattedFilters, saveForFuture, filters }) {
this.setState({
createProgress: true,
createErrorMessage: '',
});
let query = {};
- const parseQuery = queryFromFilters('_Installation', formattedFilters);
+ const parseQuery = await queryFromFilters('_Installation', formattedFilters);
if (parseQuery && parseQuery.toJSON()) {
query = parseQuery.toJSON().where || {};
diff --git a/src/dashboard/Push/PushAudiencesIndex.react.js b/src/dashboard/Push/PushAudiencesIndex.react.js
index 60529007e5..ee700c98e3 100644
--- a/src/dashboard/Push/PushAudiencesIndex.react.js
+++ b/src/dashboard/Push/PushAudiencesIndex.react.js
@@ -200,10 +200,10 @@ class PushAudiencesIndex extends DashboardView {
}
}
- createAudience(modalState, { platforms, name, formattedFilters }) {
+ async createAudience(modalState, { platforms, name, formattedFilters }) {
let query = {};
- const parseQuery = queryFromFilters('_Installation', formattedFilters);
+ const parseQuery = await queryFromFilters('_Installation', formattedFilters);
if (parseQuery && parseQuery.toJSON()) {
query = parseQuery.toJSON().where || {};
diff --git a/src/dashboard/Push/PushNew.react.js b/src/dashboard/Push/PushNew.react.js
index 87da1fa2b4..1c748b8e2d 100644
--- a/src/dashboard/Push/PushNew.react.js
+++ b/src/dashboard/Push/PushNew.react.js
@@ -800,7 +800,7 @@ class PushNew extends DashboardView {
schema={schema}
pushAudiencesStore={this.props.pushaudiences}
current={fields.audience_id}
- onChange={(audienceId, queryOrFilters, deviceCount) => {
+ onChange={async (audienceId, queryOrFilters, deviceCount) => {
this.setState({ deviceCount, audienceId });
setField('audience_id', audienceId);
if (audienceId === PushConstants.NEW_SEGMENT_ID) {
@@ -809,7 +809,12 @@ class PushNew extends DashboardView {
if (queryOrFilters instanceof Parse.Query) {
setField('target', queryOrFilters);
} else {
- setField('target', queryFromFilters('_Installation', queryOrFilters));
+ try {
+ const query = await queryFromFilters('_Installation', queryOrFilters);
+ setField('target', query);
+ } catch (error) {
+ console.error('Error in pushnew queryfilters:', error);
+ }
}
}
}}
diff --git a/src/lib/Filters.js b/src/lib/Filters.js
index 1ff04a2568..fe0013938c 100644
--- a/src/lib/Filters.js
+++ b/src/lib/Filters.js
@@ -233,4 +233,59 @@ export function availableFilters(schema, currentFilters, blacklist) {
return available;
}
+export function findRelatedClasses(referClass, allClasses, blacklist, currentFilters) {
+ const relatedClasses = {};
+ if (allClasses[referClass]) {
+ const availableForRefer = availableFilters(allClasses[referClass], currentFilters, blacklist);
+ if (Object.keys(availableForRefer).length > 0) {
+ relatedClasses[referClass] = availableForRefer;
+ }
+ }
+
+ for (const className in allClasses) {
+ if (className === referClass) {
+ continue;
+ }
+
+ if (!checkRelation(referClass, allClasses, className)) {
+ continue;
+ }
+
+ const schema = allClasses[className];
+ const available = availableFilters(schema, currentFilters, blacklist);
+ if (Object.keys(available).length > 0) {
+ relatedClasses[className] = available;
+ }
+ }
+ return relatedClasses;
+}
+
+const checkRelationHelper = (schema, col, className) =>
+ schema[col].type === 'Pointer' && schema[col].targetClass === className;
+
+function checkRelation(currentClassname, schemas, classToReferName) {
+ const currentClassSchema = schemas[currentClassname];
+ const classSchemaBeingCheckedToRefer = schemas[classToReferName];
+ let flag = false;
+
+ for (const col in currentClassSchema) {
+ if (checkRelationHelper(currentClassSchema, col, classToReferName)) {
+ flag = true;
+ }
+ }
+ for (const col in classSchemaBeingCheckedToRefer) {
+ if (checkRelationHelper(classSchemaBeingCheckedToRefer, col, currentClassname)) {
+ flag = true;
+ }
+ }
+ return flag;
+}
+
export const BLACKLISTED_FILTERS = ['containsAny', 'doesNotContainAny'];
+
+export function getFilterDetails(available) {
+ const filterClass = Object.keys(available)[0];
+ const filterField = Object.keys(available[filterClass])[0];
+ const filterConstraint = available[filterClass][filterField][0];
+ return { filterClass, filterField, filterConstraint };
+}
diff --git a/src/lib/ParseApp.js b/src/lib/ParseApp.js
index fdbdc196aa..f46755f084 100644
--- a/src/lib/ParseApp.js
+++ b/src/lib/ParseApp.js
@@ -48,7 +48,8 @@ export default class ParseApp {
columnPreference,
scripts,
classPreference,
- enableSecurityChecks
+ enableSecurityChecks,
+ cloudConfigHistoryLimit
}) {
this.name = appName;
this.createdAt = created_at ? new Date(created_at) : new Date();
@@ -77,6 +78,7 @@ export default class ParseApp {
this.columnPreference = columnPreference;
this.scripts = scripts;
this.enableSecurityChecks = !!enableSecurityChecks;
+ this.cloudConfigHistoryLimit = cloudConfigHistoryLimit;
if (!supportedPushLocales) {
console.warn(
diff --git a/src/lib/queryFromFilters.js b/src/lib/queryFromFilters.js
index 974a55c07b..047d69cad2 100644
--- a/src/lib/queryFromFilters.js
+++ b/src/lib/queryFromFilters.js
@@ -7,18 +7,93 @@
*/
import Parse from 'parse';
-// Given a className and a set of filters, generate a Parse.Query
-export default function queryFromFilters(className, filters) {
- let query;
+export default async function queryFromFilters(className, filters) {
+ let primaryQuery;
+ const querieslist = [];
if (typeof className === 'string') {
- query = new Parse.Query(className);
+ primaryQuery = new Parse.Query(className);
} else if (typeof className === 'object' && className instanceof Parse.Relation) {
- query = className.query();
+ primaryQuery = className.query();
}
- filters.forEach(filter => {
- addConstraint(query, filter);
+
+ const queries = {};
+ for (const filter of filters) {
+ const filterClassName = filter.get('class');
+ if (filterClassName === className || !filterClassName) {
+ addConstraint(primaryQuery, filter);
+ } else {
+ if (!queries[filterClassName]) {
+ queries[filterClassName] = new Parse.Query(filterClassName);
+ }
+ addConstraint(queries[filterClassName], filter);
+ }
+ }
+
+ primaryQuery.applySchemaConstraints = async function () {
+ try {
+ const allClassesSchema = await fetchAllSchemas();
+ await Promise.all(
+ Object.keys(queries).map(async filterClassName => {
+ let tempquery;
+ if (typeof className === 'string') {
+ tempquery = new Parse.Query(className);
+ } else if (typeof className === 'object' && className instanceof Parse.Relation) {
+ tempquery = className.query();
+ }
+ const reversePointerField = getPointerField(allClassesSchema, filterClassName, className);
+ const pointerField = getPointerField(allClassesSchema, className, filterClassName);
+ if (!pointerField && !reversePointerField) {
+ console.warn(`No relationship found between ${className} and ${filterClassName}`);
+ } else {
+ if (pointerField) {
+ tempquery.matchesQuery(pointerField, queries[filterClassName]);
+ }
+ if (!pointerField && reversePointerField) {
+ await tempquery.matchesKeyInQuery(
+ 'objectId',
+ `${reversePointerField}.objectId`,
+ queries[filterClassName]
+ );
+ }
+ querieslist.push(tempquery);
+ }
+ })
+ );
+ } catch (error) {
+ console.error('Error fetching schemas:', error);
+ }
+ };
+
+ await primaryQuery.applySchemaConstraints();
+ let finalQuery;
+ if (querieslist.length > 0 || filters.length > 0) {
+ finalQuery = Parse.Query.and(...querieslist, primaryQuery);
+ } else {
+ finalQuery = primaryQuery;
+ }
+
+ return finalQuery;
+}
+
+async function fetchAllSchemas() {
+ const schemas = await Parse.Schema.all();
+ const schemaMap = {};
+ schemas.forEach(schema => {
+ schemaMap[schema.className] = schema.fields;
});
- return query;
+ return schemaMap;
+}
+
+function getPointerField(allClassesSchema, fromClassName, toClassName) {
+ const schema = allClassesSchema[fromClassName];
+ if (schema) {
+ for (const field of Object.keys(schema)) {
+ if (schema[field].type === 'Pointer' && schema[field].targetClass === toClassName) {
+ return field;
+ }
+ }
+ }
+ return null;
}
function addQueryConstraintFromObject(query, filter, constraintType) {
@@ -64,9 +139,9 @@ function addConstraint(query, filter) {
const field = filter.get('field');
const compareTo = filter.get('compareTo');
if (isPointer(compareTo)) {
- const porinterQuery = new Parse.Query(compareTo.className);
- porinterQuery.startsWith('objectId', compareTo.objectId);
- query.matchesQuery(field, porinterQuery);
+ const pointerQuery = new Parse.Query(compareTo.className);
+ pointerQuery.startsWith('objectId', compareTo.objectId);
+ query.matchesQuery(field, pointerQuery);
} else {
query.startsWith(field, compareTo);
}