Skip to content

Commit 54a0347

Browse files
committed
simplify context
1 parent a88dde3 commit 54a0347

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

src/components/dagshub/data-engine/queryBuilder/QueryBuilderContext.tsx

+18-10
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,12 @@ export const QueryBuilderProvider = ({
167167
return true;
168168
};
169169

170-
const [rootCondition, setRootCondition] = useState<AndOrMetadataInput>(() => getInitialQuery());
170+
const [rootCondition, setRootCondition] = useState<AndOrMetadataInput>(getInitialQuery);
171171
const [isDisplayableInSimpleMode, setIsDisplayableInSimpleMode] = useState<boolean>(
172-
checkIfConditionIsDisplayableInSimpleMode(queryInput.query)
172+
()=>checkIfConditionIsDisplayableInSimpleMode(queryInput.query)
173173
);
174-
const [isCompoundModeForced, setIsCompoundModeForced] = useState<boolean>(false);
175174
const [isSimpleMode, setIsSimpleMode] = useState<boolean>(
176-
() => isDisplayableInSimpleMode && !isCompoundModeForced
175+
isDisplayableInSimpleMode
177176
);
178177

179178
useEffect(() => {
@@ -191,15 +190,24 @@ export const QueryBuilderProvider = ({
191190
}, [rootCondition]);
192191

193192
function onToggleQueryMode() {
194-
setIsCompoundModeForced(!isCompoundModeForced);
193+
setIsSimpleMode((isSimpleMode)=>{
194+
if(isSimpleMode){
195+
return false;
196+
} else{
197+
return isDisplayableInSimpleMode;
198+
}
199+
});
195200
}
196201

197202
useEffect(() => {
198-
console.log('set is simple mode', isDisplayableInSimpleMode && !isCompoundModeForced);
199-
console.log('is compound mode forced', isCompoundModeForced);
200-
console.log('is displayable in simple mode', isDisplayableInSimpleMode);
201-
setIsSimpleMode(isDisplayableInSimpleMode && !isCompoundModeForced);
202-
}, [isCompoundModeForced, isDisplayableInSimpleMode]);
203+
setIsSimpleMode((isSimpleMode)=>{
204+
if(isSimpleMode){
205+
return isDisplayableInSimpleMode;
206+
}else{
207+
return false;
208+
}
209+
});
210+
}, [isDisplayableInSimpleMode]);
203211

204212
//This function is used to remove the root and wrapper, if it was added for ui purposes and not needed anymore
205213
const removeRootAndBlockIfWasAddedAndNotNeeded = (condition: AndOrMetadataInput | null) => {

0 commit comments

Comments
 (0)