fix(insight): split insight from input [EE-6693] (#11176)
Co-authored-by: testa113 <testa113>pull/11188/head
parent
4bf18b1d65
commit
7a6c872948
|
@ -26,6 +26,7 @@ import { YAMLInspector } from '@/react/kubernetes/components/YAMLInspector';
|
||||||
import { ApplicationsStacksDatatable } from '@/react/kubernetes/applications/ListView/ApplicationsStacksDatatable';
|
import { ApplicationsStacksDatatable } from '@/react/kubernetes/applications/ListView/ApplicationsStacksDatatable';
|
||||||
import { NodesDatatable } from '@/react/kubernetes/cluster/HomeView/NodesDatatable';
|
import { NodesDatatable } from '@/react/kubernetes/cluster/HomeView/NodesDatatable';
|
||||||
import { StackName } from '@/react/kubernetes/DeployView/StackName/StackName';
|
import { StackName } from '@/react/kubernetes/DeployView/StackName/StackName';
|
||||||
|
import { StackNameLabelInsight } from '@/react/kubernetes/DeployView/StackName/StackNameLabelInsight';
|
||||||
import { SecretsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/SecretsFormSection';
|
import { SecretsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/SecretsFormSection';
|
||||||
import { configurationsValidationSchema } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/configurationValidationSchema';
|
import { configurationsValidationSchema } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/configurationValidationSchema';
|
||||||
import { ConfigMapsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigMapsFormSection';
|
import { ConfigMapsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigMapsFormSection';
|
||||||
|
@ -144,6 +145,10 @@ export const ngModule = angular
|
||||||
['setStackName', 'stackName', 'stacks', 'inputClassName', 'textTip']
|
['setStackName', 'stackName', 'stacks', 'inputClassName', 'textTip']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
.component(
|
||||||
|
'stackNameLabelInsight',
|
||||||
|
r2a(withUIRouter(withCurrentUser(StackNameLabelInsight)), [])
|
||||||
|
)
|
||||||
.component(
|
.component(
|
||||||
'editYamlFormSection',
|
'editYamlFormSection',
|
||||||
r2a(withUIRouter(withReactQuery(withCurrentUser(EditYamlFormSection))), [
|
r2a(withUIRouter(withReactQuery(withCurrentUser(EditYamlFormSection))), [
|
||||||
|
|
|
@ -86,6 +86,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="w-fit mb-4">
|
||||||
|
<stack-name-label-insight></stack-name-label-insight>
|
||||||
|
</div>
|
||||||
<kube-stack-name
|
<kube-stack-name
|
||||||
ng-if="!ctrl.deploymentOptions.hideStacksFunctionality && ctrl.state.BuildMethod !== ctrl.BuildMethods.HELM"
|
ng-if="!ctrl.deploymentOptions.hideStacksFunctionality && ctrl.state.BuildMethod !== ctrl.BuildMethods.HELM"
|
||||||
stack-name="ctrl.formValues.StackName"
|
stack-name="ctrl.formValues.StackName"
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { useMemo } from 'react';
|
||||||
|
|
||||||
import { useCurrentUser } from '@/react/hooks/useUser';
|
import { useCurrentUser } from '@/react/hooks/useUser';
|
||||||
|
|
||||||
import { InsightsBox } from '@@/InsightsBox';
|
|
||||||
import { Link } from '@@/Link';
|
import { Link } from '@@/Link';
|
||||||
import { TextTip } from '@@/Tip/TextTip';
|
import { TextTip } from '@@/Tip/TextTip';
|
||||||
import { Tooltip } from '@@/Tip/Tooltip';
|
import { Tooltip } from '@@/Tip/Tooltip';
|
||||||
|
@ -46,34 +45,8 @@ export function StackName({
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
const insightsBoxContent = (
|
|
||||||
<>
|
|
||||||
The stack field below was previously labelled 'Name' but, in
|
|
||||||
fact, it's always been the stack name (hence the relabelling).
|
|
||||||
{isAdmin && (
|
|
||||||
<>
|
|
||||||
<br />
|
|
||||||
Kubernetes Stacks functionality can be turned off entirely via{' '}
|
|
||||||
<Link to="portainer.settings" target="_blank">
|
|
||||||
Kubernetes Settings
|
|
||||||
</Link>
|
|
||||||
.
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="w-fit mb-4">
|
|
||||||
<InsightsBox
|
|
||||||
type="slim"
|
|
||||||
header="Stack"
|
|
||||||
content={insightsBoxContent}
|
|
||||||
insightCloseId="k8s-stacks-name"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<TextTip className="mb-4" color="blue">
|
<TextTip className="mb-4" color="blue">
|
||||||
{textTip}
|
{textTip}
|
||||||
</TextTip>
|
</TextTip>
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
import { useCurrentUser } from '@/react/hooks/useUser';
|
||||||
|
|
||||||
|
import { InsightsBox } from '@@/InsightsBox';
|
||||||
|
import { Link } from '@@/Link';
|
||||||
|
|
||||||
|
export function StackNameLabelInsight() {
|
||||||
|
const { isAdmin } = useCurrentUser();
|
||||||
|
const insightsBoxContent = (
|
||||||
|
<>
|
||||||
|
The stack field below was previously labelled 'Name' but, in
|
||||||
|
fact, it's always been the stack name (hence the relabelling).
|
||||||
|
{isAdmin && (
|
||||||
|
<>
|
||||||
|
<br />
|
||||||
|
Kubernetes Stacks functionality can be turned off entirely via{' '}
|
||||||
|
<Link to="portainer.settings" target="_blank">
|
||||||
|
Kubernetes Settings
|
||||||
|
</Link>
|
||||||
|
.
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<InsightsBox
|
||||||
|
type="slim"
|
||||||
|
header="Stack"
|
||||||
|
content={insightsBoxContent}
|
||||||
|
insightCloseId="k8s-stacks-name"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
Loading…
Reference in New Issue