mirror of
https://github.com/harness/drone.git
synced 2025-05-18 09:59:57 +08:00
fixing height for v0 and v1 versions
This commit is contained in:
parent
71be4343e2
commit
c58c99b997
@ -1,6 +1,6 @@
|
|||||||
import React, { useCallback, useEffect, useState } from 'react'
|
import React, { useCallback, useEffect, useState } from 'react'
|
||||||
import { Formik } from 'formik'
|
import { Formik } from 'formik'
|
||||||
import { capitalize, get, set } from 'lodash-es'
|
import { capitalize, get, omit, set } from 'lodash-es'
|
||||||
import { Classes, PopoverInteractionKind, PopoverPosition } from '@blueprintjs/core'
|
import { Classes, PopoverInteractionKind, PopoverPosition } from '@blueprintjs/core'
|
||||||
import { Color, FontVariation } from '@harnessio/design-system'
|
import { Color, FontVariation } from '@harnessio/design-system'
|
||||||
import { Icon, type IconName } from '@harnessio/icons'
|
import { Icon, type IconName } from '@harnessio/icons'
|
||||||
@ -81,8 +81,8 @@ interface PluginInsertionTemplateInterface {
|
|||||||
name?: string
|
name?: string
|
||||||
type: 'plugin'
|
type: 'plugin'
|
||||||
spec: {
|
spec: {
|
||||||
uses: string
|
name: string
|
||||||
with: { [key: string]: string }
|
inputs: { [key: string]: string }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,14 +90,17 @@ const PluginInsertionTemplate: PluginInsertionTemplateInterface = {
|
|||||||
name: '<step-name>',
|
name: '<step-name>',
|
||||||
type: 'plugin',
|
type: 'plugin',
|
||||||
spec: {
|
spec: {
|
||||||
uses: '<plugin-uid-from-database>',
|
name: '<plugin-uid-from-database>',
|
||||||
with: {
|
inputs: {
|
||||||
'<param1>': '<value1>',
|
'<param1>': '<value1>',
|
||||||
'<param2>': '<value2>'
|
'<param2>': '<value2>'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const PluginNameFieldPath = 'spec.name'
|
||||||
|
const PluginInputsFieldPath = 'spec.inputs'
|
||||||
|
|
||||||
export interface PluginsPanelInterface {
|
export interface PluginsPanelInterface {
|
||||||
onPluginAddUpdate: (isUpdate: boolean, pluginFormData: Record<string, any>) => void
|
onPluginAddUpdate: (isUpdate: boolean, pluginFormData: Record<string, any>) => void
|
||||||
}
|
}
|
||||||
@ -267,8 +270,8 @@ export const PluginsPanel = ({ onPluginAddUpdate }: PluginsPanelInterface): JSX.
|
|||||||
case PluginCategory.Drone:
|
case PluginCategory.Drone:
|
||||||
const payload = { ...PluginInsertionTemplate }
|
const payload = { ...PluginInsertionTemplate }
|
||||||
set(payload, 'name', name)
|
set(payload, 'name', name)
|
||||||
set(payload, 'spec.uses', pluginMetadata?.name)
|
set(payload, PluginNameFieldPath, pluginMetadata?.name)
|
||||||
set(payload, 'spec.with', pluginFormData)
|
set(payload, PluginInputsFieldPath, omit(pluginFormData, 'name'))
|
||||||
return payload as PluginInsertionTemplateInterface
|
return payload as PluginInsertionTemplateInterface
|
||||||
case PluginCategory.Harness:
|
case PluginCategory.Harness:
|
||||||
return name && image && script
|
return name && image && script
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
--heading-height: 58px;
|
--heading-height: 58px;
|
||||||
min-height: var(--page-height);
|
min-height: var(--page-height);
|
||||||
background-color: var(--white) !important;
|
background-color: var(--white) !important;
|
||||||
|
--generate-pipeline-header: 55px;
|
||||||
|
|
||||||
.layout {
|
.layout {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -14,16 +15,20 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.extendedHeight {
|
||||||
|
height: calc(100vh - var(--header-height)) !important;
|
||||||
|
}
|
||||||
|
|
||||||
.editorContainer {
|
.editorContainer {
|
||||||
width: calc(100% - 30vw);
|
width: calc(100% - 30vw);
|
||||||
height: calc(100vh - var(--header-height)) !important;
|
height: calc(100vh - var(--header-height) - var(--generate-pipeline-header));
|
||||||
border-right: 1px solid var(--grey-100);
|
border-right: 1px solid var(--grey-100);
|
||||||
padding: var(--spacing-small) !important;
|
padding: var(--spacing-small) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pluginsContainer {
|
.pluginsContainer {
|
||||||
width: 30vw;
|
width: 30vw;
|
||||||
height: calc(100vh - var(--header-height)) !important;
|
height: calc(100vh - var(--header-height) - var(--generate-pipeline-header)) !important;
|
||||||
background-color: var(--grey-50) !important;
|
background-color: var(--grey-50) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
export declare const breadcrumb: string
|
export declare const breadcrumb: string
|
||||||
export declare const drawer: string
|
export declare const drawer: string
|
||||||
export declare const editorContainer: string
|
export declare const editorContainer: string
|
||||||
|
export declare const extendedHeight: string
|
||||||
export declare const generate: string
|
export declare const generate: string
|
||||||
export declare const generateHeader: string
|
export declare const generateHeader: string
|
||||||
export declare const header: string
|
export declare const header: string
|
||||||
|
@ -3,6 +3,7 @@ import { useGet, useMutate } from 'restful-react'
|
|||||||
import { useParams } from 'react-router-dom'
|
import { useParams } from 'react-router-dom'
|
||||||
import { get, isEmpty, isUndefined, set } from 'lodash-es'
|
import { get, isEmpty, isUndefined, set } from 'lodash-es'
|
||||||
import { parse, stringify } from 'yaml'
|
import { parse, stringify } from 'yaml'
|
||||||
|
import cx from 'classnames'
|
||||||
import { Menu, PopoverPosition } from '@blueprintjs/core'
|
import { Menu, PopoverPosition } from '@blueprintjs/core'
|
||||||
import { Container, PageBody, Layout, ButtonVariation, Text, useToaster, SplitButton, Button } from '@harnessio/uicore'
|
import { Container, PageBody, Layout, ButtonVariation, Text, useToaster, SplitButton, Button } from '@harnessio/uicore'
|
||||||
import { Color, FontVariation } from '@harnessio/design-system'
|
import { Color, FontVariation } from '@harnessio/design-system'
|
||||||
@ -384,7 +385,7 @@ const AddUpdatePipeline = (): JSX.Element => {
|
|||||||
</Layout.Vertical>
|
</Layout.Vertical>
|
||||||
<PageBody>
|
<PageBody>
|
||||||
<Layout.Horizontal className={css.layout}>
|
<Layout.Horizontal className={css.layout}>
|
||||||
<Container className={css.editorContainer}>
|
<Container className={cx(css.editorContainer, { [css.extendedHeight]: yamlVersion === YamlVersion.V0 })}>
|
||||||
<MonacoSourceCodeEditor
|
<MonacoSourceCodeEditor
|
||||||
language={'yaml'}
|
language={'yaml'}
|
||||||
schema={yamlVersion === YamlVersion.V1 ? pipelineSchemaV1 : pipelineSchemaV0}
|
schema={yamlVersion === YamlVersion.V1 ? pipelineSchemaV1 : pipelineSchemaV0}
|
||||||
|
Loading…
Reference in New Issue
Block a user