Skip to content

Commit b4ffcb4

Browse files
committed
fix: option; inner kueries are now embedded
1 parent ae0c668 commit b4ffcb4

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

packages/engine/Vrapper/Vrapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1944,7 +1944,7 @@ export default class Vrapper extends Cog {
19441944
"\n\tlive update:", fieldUpdate,
19451945
"\n\tlive update options:", fieldUpdate.getOptions(),
19461946
"\n\tfailing filter subscription:", ...dumpObject(subscription),
1947-
"\n\tstate:", ...dumpObject(trigger.getState().toJS())),
1947+
"\n\tstate:", ...dumpObject(fieldUpdate.getState().toJS())),
19481948
`Exception caught during Subscription.triggerFilterHooks('${fieldUpdate._fieldName}')`);
19491949
}
19501950
}

packages/inspire/ui/UIComponent/_renderOps.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,20 @@ export function _tryRenderLens (component: UIComponent, lens: any, focus: any,
155155
if (lens instanceof Kuery) {
156156
// Delegates the kuery resolution to LiveProps.
157157
subLensName = `kuery-${lensName}`;
158-
ret = React.createElement(UIComponent,
159-
component.childProps(subLensName, {}, { delegate: [lens] }));
158+
const delayed = thenChainEagerly(
159+
component.bindLiveKuery(subLensName, component.getUIContextValue("frame"), lens,
160+
{ asRepeathenable: true, scope: component.getUIContext() }),
161+
update => {
162+
const newLensValue = update.value();
163+
if (ret === undefined) {
164+
ret = (newLensValue === undefined) ? null : newLensValue;
165+
} else if (ret !== newLensValue) {
166+
component.forceUpdate();
167+
}
168+
});
169+
if (ret === undefined) ret = delayed || null;
170+
// ret = React.createElement(UIComponent,
171+
// component.childProps(subLensName, {}, { delegate: [lens] }));
160172
} else if (lens instanceof Vrapper) {
161173
const blocker = lens.activate();
162174
if (blocker) {

packages/prophet/Scribe/_eventOps.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ export function _chronicleEvents (connection: ScribePartitionConnection,
201201
function _chronicleReceivedEventsUpstream (receivedEvents) {
202202
newLocallyReceivedEvents = receivedEvents.filter(notNull => notNull);
203203
if (!newLocallyReceivedEvents.length) return ({ eventResults: [] });
204-
return connection.getUpstreamConnection().chronicleEvents(newLocallyReceivedEvents, options);
204+
return connection.getUpstreamConnection()
205+
.chronicleEvents(newLocallyReceivedEvents, options);
205206
},
206207
function _syncToChronicleResultTruthEvents ({ eventResults }) {
207208
upstreamEventResults = eventResults;

packages/toolset-rest-api-gateway-plugin/fastify/handlers/resource/deleteResource.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import type RestAPIServer, { Route } from "~/toolset-rest-api-gateway-plugin/fastify/RestAPIServer";
44
// import { dumpObject, thenChainEagerly } from "~/tools";
5-
import { _verifyResourceAuthorization } from "./_resourceHandlerOps";
5+
// import { _verifyResourceAuthorization } from "./_resourceHandlerOps";
66

77
export default function createRouteHandler (server: RestAPIServer, route: Route) {
88
return {

packages/toolset-rest-api-gateway-plugin/schema-builder/routes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @flow
22

33
import { wrapError, dumpify, dumpObject } from "~/tools";
4-
import valosheath from "~/gateway-api/valosheath";
54

65
import {
76
ArrayJSONSchema, ObjectJSONSchema, StringType, XWWWFormURLEncodedStringType, IdValOSType,

0 commit comments

Comments
 (0)