Commitd571a7f

committed

Merge branch 'dev' into tags_component

2 parents51de3a3 +48d6d7b commitd571a7fCopy full SHA for d571a7f

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,8 @@ class TabbedContainerImplComp extends TabbedContainerBaseComp implements IContai`
`407`	`407`	`},`
`408`	`408`	`}asCompAction;`
`409`	`409`	`}`
`410`		`-if(value.type==="delete"&&this.children.tabs.getView().length<=1){`
	`410`	`+const{ path}=action;`
	`411`	`+if(value.type==="delete"&&path[0]==='tabs'&&this.children.tabs.getView().length<=1){`
`411`	`412`	`messageInstance.warning(trans("tabbedContainer.atLeastOneTabError"));`
`412`	`413`	`// at least one tab`
`413`	`414`	`returnthis;`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,9 @@ const DrawerView = React.memo((`
`217`	`217`	`body:{`
`218`	`218`	`padding:0,`
`219`	`219`	`background:props.style.background`
`220`		`-}`
`221`		`-}),[props.style.background]);`
	`220`	`+},`
	`221`	`+mask:props.showMask ?undefined :{background:"transparent"}`
	`222`	`+}),[props.style.background,props.showMask]);`
`222`	`223`
`223`	`224`	`constrootStyle=useMemo(()=>`
`224`	`225`	`props.visible.value ?{overflow:"auto",pointerEvents:"auto"} :{},`
`@@ -232,7 +233,7 @@ const DrawerView = React.memo((`
`232`	`233`	`resizable={resizable}`
`233`	`234`	`onResizeStop={onResizeStop}`
`234`	`235`	`rootStyle={rootStyleasany}`
`235`		`-styles={drawerStyles}`
	`236`	`+styles={drawerStylesasany}`
`236`	`237`	`title={props.title}`
`237`	`238`	`$titleAlign={props.titleAlign}`
`238`	`239`	`$drawerScrollbar={props.drawerScrollbar}`
`@@ -248,7 +249,7 @@ const DrawerView = React.memo((`
`248`	`249`	`afterOpenChange={afterOpenChange}`
`249`	`250`	`zIndex={Layers.drawer}`
`250`	`251`	`maskClosable={props.maskClosable}`
`251`		`-mask={props.showMask}`
	`252`	`+mask={true}`
`252`	`253`	className={clsx(`app-${appID}`,props.className)}
`253`	`254`	`data-testid={props.dataTestIdasstring}`
`254`	`255`	`>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ export const QueryLibraryEditor = () => {`
`146`	`146`
`147`	`147`	`useEffect(()=>{`
`148`	`148`	`if(orgId){`
	`149`	`+dispatch(fetchDataSourceTypes({organizationId:orgId}));`
`149`	`150`	`dispatch(`
`150`	`151`	`fetchDatasource({`
`151`	`152`	`organizationId:orgId,`

Comments

(0)