hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

master-merge fix

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/components/+apps-releases/release-details.tsx
View File

@ -96,7 +96,7 @@ export class ReleaseDetails extends Component<Props> {
async loadDetails() { async loadDetails() {
const { release } = this.props; const { release } = this.props;
try { try {
this.details = null; this.details = null;
this.details = await getRelease(release.getName(), release.getNs()); this.details = await getRelease(release.getName(), release.getNs());
@ -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}
> >

57
src/renderer/components/+custom-resources/crd-details.tsx
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> {
@ -125,37 +124,37 @@ export class CRDDetails extends React.Component<Props> {
</TableRow> </TableRow>
</Table> </Table>
{printerColumns.length > 0 && {printerColumns.length > 0 &&
<> <>
<DrawerTitle title="Additional Printer Columns"/> <DrawerTitle title="Additional Printer Columns"/>
<Table selectable className="printer-columns box grow"> <Table selectable className="printer-columns box grow">
<TableHead> <TableHead>
<TableCell className="name">Name</TableCell> <TableCell className="name">Name</TableCell>
<TableCell className="type">Type</TableCell> <TableCell className="type">Type</TableCell>
<TableCell className="json-path">JSON Path</TableCell> <TableCell className="json-path">JSON Path</TableCell>
</TableHead> </TableHead>
{ {
printerColumns.map((column, index) => { printerColumns.map((column, index) => {
const { name, type, jsonPath } = column; const { name, type, jsonPath } = column;
return ( return (
<TableRow key={index}> <TableRow key={index}>
<TableCell className="name">{name}</TableCell> <TableCell className="name">{name}</TableCell>
<TableCell className="type">{type}</TableCell> <TableCell className="type">{type}</TableCell>
<TableCell className="json-path"> <TableCell className="json-path">
<Badge label={jsonPath}/> <Badge label={jsonPath}/>
</TableCell> </TableCell>
</TableRow> </TableRow>
); );
}) })
} }
</Table> </Table>
</> </>
} }
{validation && {validation &&
<> <>
<DrawerTitle title="Validation"/> <DrawerTitle title="Validation"/>
<MonacoEditor readOnly value={validation}/> <MonacoEditor readOnly value={validation}/>
</> </>
} }
</div> </div>
); );

1
src/renderer/utils/__tests__/storageHelper.test.ts
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";