Skip to content

Commit 2efe0e7

Browse files
vardhan0604vardhan0604
committed
corrected the variable name using right naming conventions
1 parent e164e9b commit 2efe0e7

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎src/components/BrowserFilter/BrowserFilter.react.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default class BrowserFilter extends React.Component {
4848
if (this.props.filters.size === 0) {
4949
const available = Filters.findRelatedClasses(
5050
this.props.className,
51-
this.props.AllclassesSchema,
51+
this.props.allClassesSchema,
5252
this.state.blacklistedFilters,
5353
this.state.filters
5454
);
@@ -72,7 +72,7 @@ export default class BrowserFilter extends React.Component {
7272
addRow() {
7373
const available = Filters.findRelatedClasses(
7474
this.props.className,
75-
this.props.AllclassesSchema,
75+
this.props.allClassesSchema,
7676
this.state.blacklistedFilters,
7777
this.state.filters
7878
);
@@ -137,7 +137,7 @@ export default class BrowserFilter extends React.Component {
137137
}
138138
const available = Filters.findRelatedClasses(
139139
this.props.className,
140-
this.props.AllclassesSchema,
140+
this.props.allClassesSchema,
141141
this.state.blacklistedFilters,
142142
this.state.filters
143143
);
@@ -169,10 +169,10 @@ export default class BrowserFilter extends React.Component {
169169
filters={this.state.filters}
170170
onChange={filters => this.setState({ filters: filters })}
171171
onSearch={this.apply.bind(this)}
172-
Allclasses={this.props.AllclassesSchema}
173-
AllclassesSchema={Filters.findRelatedClasses(
172+
allClasses={this.props.allClassesSchema}
173+
allClassesSchema={Filters.findRelatedClasses(
174174
this.props.className,
175-
this.props.AllclassesSchema
175+
this.props.allClassesSchema
176176
)}
177177
renderRow={props => (
178178
<FilterRow

‎src/components/Filter/Filter.react.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function deleteRow(filters, index) {
8383
const Filter = ({
8484
schema,
8585
filters,
86-
Allclasses,
86+
allClasses,
8787
renderRow,
8888
onChange,
8989
onSearch,
@@ -92,7 +92,7 @@ const Filter = ({
9292
}) => {
9393
const currentApp = React.useContext(CurrentApp);
9494
blacklist = blacklist || [];
95-
const available = Filters.findRelatedClasses(className, Allclasses, blacklist, filters);
95+
const available = Filters.findRelatedClasses(className, allClasses, blacklist, filters);
9696
const classes = Object.keys(available).concat([]);
9797
return (
9898
<div

‎src/dashboard/Data/Browser/Browser.react.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ class Browser extends DashboardView {
103103
draggedRowSelection: false,
104104

105105
classes: {},
106-
AllclassesSchema: {}
106+
allClassesSchema: {}
107107
};
108108

109109
this.addLocation = this.addLocation.bind(this);
110-
this.AllclassesSchema = this.getAllclassesSchema.bind(this);
110+
this.allClassesSchema = this.getAllClassesSchema.bind(this);
111111
this.removeLocation = this.removeLocation.bind(this);
112112
this.prefetchData = this.prefetchData.bind(this);
113113
this.fetchData = this.fetchData.bind(this);
@@ -229,7 +229,7 @@ class Browser extends DashboardView {
229229
if (!nextProps.params.className && nextProps.schema.data.get('classes')) {
230230
const t = nextProps.schema.data.get('classes');
231231
this.classes = Object.keys(t.toObject());
232-
this.AllclassesSchema = this.getAllclassesSchema(this.classes ,nextProps.schema.data.get('classes'));
232+
this.allClassesSchema = this.getAllClassesSchema(this.classes ,nextProps.schema.data.get('classes'));
233233
this.redirectToFirstClass(nextProps.schema.data.get('classes'), nextContext);
234234
}
235235
}
@@ -758,10 +758,10 @@ class Browser extends DashboardView {
758758
}
759759
}
760760

761-
getAllclassesSchema(Allclasses , allclassesdata) {
761+
getAllClassesSchema(allClasses , allClassesData) {
762762
const schemaSimplifiedData = {};
763-
Allclasses.forEach((className) => {
764-
const classSchema = allclassesdata.get(className);
763+
allClasses.forEach((className) => {
764+
const classSchema = allClassesData.get(className);
765765
if (classSchema) {
766766
schemaSimplifiedData[className] = {};
767767
classSchema.forEach(({ type, targetClass }, col) => {
@@ -797,9 +797,9 @@ class Browser extends DashboardView {
797797
}
798798
}
799799

800-
async fetchParseData(source, filters, AllclassesSchema) {
800+
async fetchParseData(source, filters) {
801801
const { useMasterKey } = this.state;
802-
const query = await queryFromFilters(source, filters, AllclassesSchema);
802+
const query = await queryFromFilters(source, filters);
803803
const sortDir = this.state.ordering[0] === '-' ? '-' : '+';
804804
const field = this.state.ordering.substr(sortDir === '-' ? 1 : 0);
805805

@@ -839,15 +839,15 @@ class Browser extends DashboardView {
839839
}
840840
}
841841

842-
async fetchParseDataCount(source, filters,AllclassesSchema) {
843-
const query = await queryFromFilters(source, filters,AllclassesSchema);
842+
async fetchParseDataCount(source, filters) {
843+
const query = await queryFromFilters(source, filters);
844844
const { useMasterKey } = this.state;
845845
const count = await query.count({ useMasterKey });
846846
return count;
847847
}
848848

849849
async fetchData(source, filters = new List()) {
850-
const data = await this.fetchParseData(source, filters,this.AllclassesSchema);
850+
const data = await this.fetchParseData(source, filters);
851851
const filteredCounts = { ...this.state.filteredCounts };
852852
if (filters.size > 0) {
853853
if (this.state.isUnique) {

‎src/dashboard/Data/Browser/BrowserToolbar.react.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ const BrowserToolbar = ({
7474
toggleMasterKeyUsage,
7575

7676
selectedData,
77-
Allclasses,
78-
AllclassesSchema,
77+
allClasses,
78+
allClassesSchema,
7979
}) => {
8080
const selectionLength = Object.keys(selection).length;
8181
const isPendingEditCloneRows = editCloneRows && editCloneRows.length > 0;
@@ -227,7 +227,7 @@ const BrowserToolbar = ({
227227
});
228228
}
229229

230-
Allclasses.forEach(className => {
230+
allClasses.forEach(className => {
231231
const classSchema = schema.data.get('classes').get(className);
232232

233233
if (classSchema) {
@@ -366,8 +366,8 @@ const BrowserToolbar = ({
366366
className={classNameForEditors}
367367
blacklistedFilters={onAddRow ? [] : ['unique']}
368368
disabled={isPendingEditCloneRows}
369-
Allclasses={Allclasses}
370-
AllclassesSchema={AllclassesSchema}
369+
allClasses={allClasses}
370+
allClassesSchema={allClassesSchema}
371371
/>
372372
{onAddRow && <div className={styles.toolbarSeparator} />}
373373
{enableSecurityDialog ? (

‎src/dashboard/Data/Browser/DataBrowser.react.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default class DataBrowser extends React.Component {
3434
editing: false,
3535
copyableValue: undefined,
3636
simplifiedSchema: this.getSimplifiedSchema(props.schema, props.className),
37-
AllclassesSchema: this.getAllclassesSchema(props.schema,props.classes),
37+
allClassesSchema: this.getAllClassesSchema(props.schema,props.classes),
3838

3939
selectedCells: { list: new Set(), rowStart: -1, rowEnd: -1, colStart: -1, colEnd: -1 },
4040
firstSelectedCell: null,
@@ -109,13 +109,13 @@ export default class DataBrowser extends React.Component {
109109
}, 1000);
110110
}
111111

112-
getAllclassesSchema(schema,Allclasses) {
112+
getAllClassesSchema(schema,allClasses) {
113113

114114
const schemaSimplifiedData = {};
115-
if(!Allclasses){
116-
Allclasses = Object.keys(schema.data.get('classes').toObject());
115+
if(!allClasses){
116+
allClasses = Object.keys(schema.data.get('classes').toObject());
117117
}
118-
Allclasses.forEach((className) => {
118+
allClasses.forEach((className) => {
119119
const classSchema = schema.data.get('classes').get(className);
120120
if (classSchema) {
121121
schemaSimplifiedData[className] = {};
@@ -471,8 +471,8 @@ export default class DataBrowser extends React.Component {
471471
onCancelPendingEditRows={onCancelPendingEditRows}
472472
order={this.state.order}
473473
selectedData={this.state.selectedData}
474-
Allclasses={Object.keys(this.props.schema.data.get('classes').toObject())}
475-
AllclassesSchema={this.state.AllclassesSchema}
474+
allClasses={Object.keys(this.props.schema.data.get('classes').toObject())}
475+
allClassesSchema={this.state.allClassesSchema}
476476
{...other}
477477
/>
478478

‎src/lib/Filters.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ export function availableFilters(schema, currentFilters, blacklist) {
233233
return available;
234234
}
235235

236-
export function findRelatedClasses(referClass , Allclasses, blacklist, currentFilters) {
236+
export function findRelatedClasses(referClass , allClasses, blacklist, currentFilters) {
237237
const relatedClasses = {};
238-
for (const className in Allclasses) {
239-
if (!checkRelation(referClass,Allclasses[className]) && referClass !== className){
238+
for (const className in allClasses) {
239+
if (!checkRelation(referClass,allClasses[className]) && referClass !== className){
240240
continue;
241241
}
242-
const schema = Allclasses[className];
242+
const schema = allClasses[className];
243243
const available = availableFilters(schema, currentFilters, blacklist);
244244
if (Object.keys(available).length > 0) {
245245
relatedClasses[className] = available;

‎src/lib/queryFromFilters.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default async function queryFromFilters(className, filters) {
3131

3232
primaryQuery.applySchemaConstraints = async function () {
3333
try {
34-
const AllclassesSchema = await fetchAllSchemas();
34+
const allClassesSchema = await fetchAllSchemas();
3535
await Promise.all(
3636
Object.keys(queries).map(async filterClassName => {
3737
let tempquery;
@@ -40,14 +40,14 @@ export default async function queryFromFilters(className, filters) {
4040
} else if (typeof className === 'object' && className instanceof Parse.Relation) {
4141
tempquery = className.query();
4242
}
43-
const reversePointerField = getPointerField(AllclassesSchema, filterClassName, className);
44-
const pointerField = getPointerField(AllclassesSchema, className, filterClassName);
43+
const reversePointerField = getPointerField(allClassesSchema, filterClassName, className);
44+
const pointerField = getPointerField(allClassesSchema, className, filterClassName);
4545
if (pointerField) {
4646
tempquery.matchesQuery(pointerField, queries[filterClassName]);
4747
} else if (reversePointerField) {
4848
await tempquery.matchesKeyInQuery(
4949
'objectId',
50-
'userPointer.objectId',
50+
`${reversePointerField}.objectId`,
5151
queries[filterClassName]
5252
)
5353
querieslist.push(tempquery);
@@ -77,8 +77,8 @@ async function fetchAllSchemas() {
7777
return schemaMap;
7878
}
7979

80-
function getPointerField(AllClassSchema, fromClassName, toClassName) {
81-
const schema = AllClassSchema[fromClassName];
80+
function getPointerField(allClassesSchema, fromClassName, toClassName) {
81+
const schema = allClassesSchema[fromClassName];
8282
if (schema) {
8383
for (const field of Object.keys(schema)) {
8484
if (schema[field].type === 'Pointer' && schema[field].targetClass === toClassName) {

0 commit comments

Comments
 (0)