fix: merged main into branch

kubeshop · Mar 8, 2022 · 372a401 · 372a401
1 parent efdfca1
commit 372a401
Showing 1 changed file with 40 additions and 39 deletions.
diff --git a/src/components/organisms/ActionsPane/ActionsPane.tsx b/src/components/organisms/ActionsPane/ActionsPane.tsx
@@ -451,47 +451,48 @@ const ActionsPane: React.FC<IProps> = props => {
                 </Tooltip>
               )}
 
-            <Tooltip
-              mouseEnterDelay={TOOLTIP_DELAY}
-              title={
-                selectedPath
-                  ? isHelmValuesFile(selectedPath)
-                    ? InstallValuesFileTooltip
-                    : ApplyFileTooltip
-                  : ApplyTooltip
-              }
-              placement="bottomLeft"
-            >
-              <Button
-                loading={Boolean(applyingResource)}
-                type="primary"
-                size="small"
-                ghost
-                onClick={applySelection}
-                disabled={
-                  (!selectedResourceId && !selectedPath) ||
-                  (selectedResource &&
-                    !isKustomizationResource(selectedResource) &&
-                    (isKustomizationPatch(selectedResource) || !knownResourceKinds.includes(selectedResource.kind)))
+              <Tooltip
+                mouseEnterDelay={TOOLTIP_DELAY}
+                title={
+                  selectedPath
+                    ? isHelmValuesFile(selectedPath)
+                      ? InstallValuesFileTooltip
+                      : ApplyFileTooltip
+                    : ApplyTooltip
                 }
-                icon={<Icon name="kubernetes" />}
-              >
-                {selectedPath && isHelmValuesFile(selectedPath) ? 'Install' : 'Deploy'}
-              </Button>
-            </Tooltip>
-            <Tooltip mouseEnterDelay={TOOLTIP_DELAY} title={DiffTooltip} placement="bottomLeft">
-              <S.DiffButton
-                size="small"
-                type="primary"
-                ghost
-                onClick={diffSelectedResource}
-                disabled={isDiffButtonDisabled}
+                placement="bottomLeft"
               >
-                Diff
-              </S.DiffButton>
-            </Tooltip>
-          </>
-        </TitleBar>
+                <Button
+                  loading={Boolean(applyingResource)}
+                  type="primary"
+                  size="small"
+                  ghost
+                  onClick={applySelection}
+                  disabled={
+                    (!selectedResourceId && !selectedPath) ||
+                    (selectedResource &&
+                      !isKustomizationResource(selectedResource) &&
+                      (isKustomizationPatch(selectedResource) || !knownResourceKinds.includes(selectedResource.kind)))
+                  }
+                  icon={<Icon name="kubernetes" />}
+                >
+                  {selectedPath && isHelmValuesFile(selectedPath) ? 'Install' : 'Deploy'}
+                </Button>
+              </Tooltip>
+              <Tooltip mouseEnterDelay={TOOLTIP_DELAY} title={DiffTooltip} placement="bottomLeft">
+                <S.DiffButton
+                  size="small"
+                  type="primary"
+                  ghost
+                  onClick={diffSelectedResource}
+                  disabled={isDiffButtonDisabled}
+                >
+                  Diff
+                </S.DiffButton>
+              </Tooltip>
+            </>
+          </TitleBar>
+        )}
       </div>
 
       {!selectedPreviewConfigurationId ? (