1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

master-merge fix

Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2021-10-18 13:30:38 +03:00
parent d55d6a1344
commit 0c517b14d0
3 changed files with 31 additions and 31 deletions

View File

@ -165,7 +165,7 @@ export class ReleaseDetails extends Component<Props> {
/> />
<MonacoEditor <MonacoEditor
className={cssNames({ loading: valuesLoading })} className={cssNames({ loading: valuesLoading })}
readOnly={valuesLoading || this.showOnlyUserSuppliedValues} readOnly={valuesLoading}
value={values} value={values}
onChange={text => this.values = text} onChange={text => this.values = text}
> >

View File

@ -32,7 +32,6 @@ import { Table, TableCell, TableHead, TableRow } from "../table";
import { Input } from "../input"; import { Input } from "../input";
import { KubeObjectMeta } from "../kube-object-meta"; import { KubeObjectMeta } from "../kube-object-meta";
import { MonacoEditor } from "../monaco-editor"; import { MonacoEditor } from "../monaco-editor";
import { UserStore } from "../../../common/user-store";
import logger from "../../../common/logger"; import logger from "../../../common/logger";
interface Props extends KubeObjectDetailsProps<CustomResourceDefinition> { interface Props extends KubeObjectDetailsProps<CustomResourceDefinition> {

View File

@ -19,6 +19,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
import { jest } from "@jest/globals";
import { observable, reaction } from "mobx"; import { observable, reaction } from "mobx";
import { StorageHelper } from "../storageHelper"; import { StorageHelper } from "../storageHelper";
import { delay } from "../../../common/utils/delay"; import { delay } from "../../../common/utils/delay";