Forker/fluxscape
1
0
Fork 0
mirror of https://github.com/fluxscape/fluxscape.git synced 2026-01-10 14:22:53 +01:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

chore: code clean up (#76)

Browse Source
This commit is contained in:
Eric Tuvesson
2024-10-01 16:09:03 +02:00
committed by GitHub
parent d80870e835
commit 5dbb11bac8
4 changed files with 87 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/noodl-runtime/src/api/cloudstore.js
View File

@@ -73,8 +73,9 @@ class CloudStore {
xhr.open(options.method || 'GET', this.endpoint + path, true);
xhr.setRequestHeader('X-Parse-Application-Id', this.appId);
if (typeof _noodl_cloudservices !== 'undefined')
if (typeof _noodl_cloudservices !== 'undefined') {
xhr.setRequestHeader('X-Parse-Master-Key', _noodl_cloudservices.masterKey);
}
// Check for current users
var _cu = localStorage['Parse/' + this.appId + '/currentUser'];
@@ -191,13 +192,13 @@ class CloudStore {
// I don't know which version the API was changed, lets just say above 4 for now.
if (this.dbVersionMajor && this.dbVersionMajor > 4) {
grouping._id = null;
if (options.where) args.push('$match=' + encodeURIComponent(JSON.stringify(options.where)));
args.push('$group=' + JSON.stringify(grouping));
} else {
grouping.objectId = null;
if (options.where) args.push('match=' + encodeURIComponent(JSON.stringify(options.where)));
args.push('group=' + JSON.stringify(grouping));
@@ -257,11 +258,22 @@ class CloudStore {
});
}
/**
*
* @param {{
* objectId: string;
* collection: string;
* include?: string[] | string;
* success: (data: unknown) => void;
* error: (error: unknown) => void;
* }} options
*/
fetch(options) {
const args = [];
if (options.include)
if (options.include) {
args.push('include=' + (Array.isArray(options.include) ? options.include.join(',') : options.include));
}
this._makeRequest(
'/classes/' + options.collection + '/' + options.objectId + (args.length > 0 ? '?' + args.join('&') : ''),
@@ -433,6 +445,8 @@ class CloudStore {
* file: {
* name: string;
* }
* success: (data: unknown) => void;
* error: (error: unknown) => void;
* }} options
*/
deleteFile(options) {
@@ -563,21 +577,26 @@ function _deserializeJSON(data, type, modelScope) {
}
function _fromJSON(item, collectionName, modelScope) {
const m = (modelScope || Model).get(item.objectId);
m._class = collectionName;
const modelStore = modelScope || Model;
if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined)
var schema = CloudStore._collections[collectionName].schema;
const model = modelStore.get(item.objectId);
model._class = collectionName;
for (var key in item) {
if (key === 'objectId' || key === 'ACL') continue;
var _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
m.set(key, _deserializeJSON(item[key], _type, modelScope));
let schema = undefined;
if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined) {
schema = CloudStore._collections[collectionName].schema;
}
return m;
for (const key in item) {
if (key === 'objectId' || key === 'ACL') {
continue;
}
const _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
model.set(key, _deserializeJSON(item[key], _type, modelScope));
}
return model;
}
CloudStore._fromJSON = _fromJSON;

29
packages/noodl-runtime/src/api/records.js
View File

@@ -12,7 +12,7 @@ function createRecordsAPI(modelScope) {
return {
async query(className, query, options) {
if (typeof className === "undefined") throw new Error("'className' is undefined");
if (typeof className === 'undefined') throw new Error("'className' is undefined");
return new Promise((resolve, reject) => {
cloudstore().query({
collection: className,
@@ -27,9 +27,9 @@ function createRecordsAPI(modelScope) {
include: options ? options.include : undefined,
select: options ? options.select : undefined,
count: options ? options.count : undefined,
success: (results,count) => {
success: (results, count) => {
const _results = results.map((r) => cloudstore()._fromJSON(r, className));
if(count !== undefined) resolve({results:_results,count});
if (count !== undefined) resolve({ results: _results, count });
else resolve(_results);
},
error: (err) => {
@@ -40,7 +40,7 @@ function createRecordsAPI(modelScope) {
},
async count(className, query) {
if (typeof className === "undefined") throw new Error("'className' is undefined");
if (typeof className === 'undefined') throw new Error("'className' is undefined");
return new Promise((resolve, reject) => {
cloudstore().count({
collection: className,
@@ -62,7 +62,7 @@ function createRecordsAPI(modelScope) {
},
async distinct(className, property, query) {
if (typeof className === "undefined") throw new Error("'className' is undefined");
if (typeof className === 'undefined') throw new Error("'className' is undefined");
return new Promise((resolve, reject) => {
cloudstore().distinct({
collection: className,
@@ -85,7 +85,7 @@ function createRecordsAPI(modelScope) {
},
async aggregate(className, group, query) {
if (typeof className === "undefined") throw new Error("'className' is undefined");
if (typeof className === 'undefined') throw new Error("'className' is undefined");
return new Promise((resolve, reject) => {
cloudstore().aggregate({
collection: className,
@@ -107,20 +107,31 @@ function createRecordsAPI(modelScope) {
});
},
/**
*
* @param {string | { getId(): string; }} objectOrId
* @param {{
* className: string;
* include?: string[] | string;
* }} options
* @returns {Promise<unknown>}
*/
async fetch(objectOrId, options) {
if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;
return new Promise((resolve, reject) => {
if (!className) return reject('No class name specified');
if (!className) {
return reject('No class name specified');
}
cloudstore().fetch({
collection: className,
objectId: objectOrId,
include: options ? options.include : undefined,
success: function (response) {
var record = cloudstore()._fromJSON(response, className);
const record = cloudstore()._fromJSON(response, className);
resolve(record);
},
error: function (err) {
@@ -186,7 +197,7 @@ function createRecordsAPI(modelScope) {
},
async create(className, properties, options) {
if (typeof className === "undefined") throw new Error("'className' is undefined");
if (typeof className === 'undefined') throw new Error("'className' is undefined");
return new Promise((resolve, reject) => {
cloudstore().create({
collection: className,

55
packages/noodl-runtime/src/nodes/std-library/data/dbmodelnode2.js
View File

@@ -2,10 +2,10 @@
const { Node, EdgeTriggeredInput } = require('../../../../noodl-runtime');
var Model = require('../../../model');
const Model = require('../../../model');
const CloudStore = require('../../../api/cloudstore');
var ModelNodeDefinition = {
const ModelNodeDefinition = {
name: 'DbModel2',
docs: 'https://docs.noodl.net/nodes/data/cloud-data/record',
displayNodeName: 'Record',
@@ -21,11 +21,11 @@ var ModelNodeDefinition = {
}
],
initialize: function () {
var internal = this._internal;
const internal = this._internal;
internal.inputValues = {};
internal.relationModelIds = {};
var _this = this;
const _this = this;
this._internal.onModelChangedCallback = function (args) {
if (_this.isInputConnected('fetch')) return;
@@ -109,13 +109,18 @@ var ModelNodeDefinition = {
displayName: 'Id',
group: 'General',
set: function (value) {
if (value instanceof Model) value = value.getId();
// Can be passed as model as well
else if (typeof value === 'object') value = Model.create(value).getId(); // If this is an js object, dereference it
if (value instanceof Model) {
// Can be passed as model as well
value = value.getId();
} else if (typeof value === 'object') {
// If this is an js object, dereference it
value = Model.create(value).getId();
}
this._internal.modelId = value; // Wait to fetch data
if (this.isInputConnected('fetch') === false) this.setModelID(value);
else {
if (this.isInputConnected('fetch') === false) {
this.setModelID(value);
} else {
this.flagOutputDirty('id');
}
}
@@ -138,9 +143,10 @@ var ModelNodeDefinition = {
this.setModel(model);
},
setModel: function (model) {
if (this._internal.model)
if (this._internal.model) {
// Remove old listener if existing
this._internal.model.off('change', this._internal.onModelChangedCallback);
}
this._internal.model = model;
this.flagOutputDirty('id');
@@ -148,7 +154,9 @@ var ModelNodeDefinition = {
// We have a new model, mark all outputs as dirty
for (var key in model.data) {
if (this.hasOutput('prop-' + key)) this.flagOutputDirty('prop-' + key);
if (this.hasOutput('prop-' + key)) {
this.flagOutputDirty('prop-' + key);
}
}
this.sendSignalOnOutput('fetched');
},
@@ -184,7 +192,7 @@ var ModelNodeDefinition = {
}
},
scheduleFetch: function () {
var _this = this;
const _this = this;
const internal = this._internal;
this.scheduleOnce('Fetch', function () {
@@ -199,12 +207,13 @@ var ModelNodeDefinition = {
collection: internal.collectionId,
objectId: internal.modelId, // Get the objectId part of the model id
success: function (response) {
var model = cloudstore._fromJSON(response, internal.collectionId);
const model = cloudstore._fromJSON(response, internal.collectionId);
if (internal.model !== model) {
// Check if we need to change model
if (internal.model)
if (internal.model) {
// Remove old listener if existing
internal.model.off('change', internal.onModelChangedCallback);
}
internal.model = model;
model.on('change', internal.onModelChangedCallback);
@@ -213,8 +222,10 @@ var ModelNodeDefinition = {
delete response.objectId;
for (var key in response) {
if (_this.hasOutput('prop-' + key)) _this.flagOutputDirty('prop-' + key);
for (const key in response) {
if (_this.hasOutput('prop-' + key)) {
_this.flagOutputDirty('prop-' + key);
}
}
_this.sendSignalOnOutput('fetched');
@@ -226,7 +237,6 @@ var ModelNodeDefinition = {
});
},
scheduleStore: function () {
var _this = this;
var internal = this._internal;
if (!internal.model) return;
@@ -247,8 +257,6 @@ var ModelNodeDefinition = {
});
},
registerInputIfNeeded: function (name) {
var _this = this;
if (this.hasInput(name)) {
return;
}
@@ -328,8 +336,7 @@ function updatePorts(nodeId, parameters, editorConnection, graphModel) {
var p = props[key];
if (ports.find((_p) => _p.name === key)) continue;
if (p.type === 'Relation') {
} else {
if (p.type !== 'Relation') {
// Other schema type ports
const _typeMap = {
String: 'string',
@@ -373,16 +380,16 @@ module.exports = {
function _managePortsForNode(node) {
updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
node.on('parameterUpdated', function (event) {
node.on('parameterUpdated', function () {
updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
});
graphModel.on('metadataChanged.dbCollections', function (data) {
graphModel.on('metadataChanged.dbCollections', function () {
CloudStore.invalidateCollections();
updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
});
graphModel.on('metadataChanged.systemCollections', function (data) {
graphModel.on('metadataChanged.systemCollections', function () {
CloudStore.invalidateCollections();
updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
});

5
packages/noodl-viewer-react/src/nodes-deprecated/std-library/data/variablenode.js
View File

@@ -1,10 +1,9 @@
'use strict';
const { Node } = require('@noodl/runtime');
const Model = require('@noodl/runtime/src/model');
var Model = require('@noodl/runtime/src/model');
var VariableNodeDefinition = {
const VariableNodeDefinition = {
name: 'Variable',
docs: 'https://docs.noodl.net/nodes/data/variable',
category: 'Data',