Merge pull request #879 from amitamrutiya/update-da

add deplinking and collapse expand support for meshery ui
layer5io · Feb 14, 2025 · ebcb059 · ebcb059
2 parents ffa3213 + b6735ba
commit ebcb059
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 8 deletions.
diff --git a/src/custom/ResourceDetailFormatters/Component.tsx b/src/custom/ResourceDetailFormatters/Component.tsx
@@ -1,6 +1,8 @@
-import React from 'react';
+import UnfoldLessIcon from '@mui/icons-material/UnfoldLess';
+import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore';
+import React, { useState } from 'react';
 import { Grid, IconButton, Typography } from '../../base';
-import { iconSmall } from '../../constants/iconsSizes';
+import { iconSmall, iconXSmall } from '../../constants/iconsSizes';
 import { CopyIcon } from '../../icons';
 import { useTheme } from '../../theme';
 import { CustomTooltip } from './../CustomTooltip';
@@ -29,7 +31,7 @@ import {
   PrimaryDetailsProps,
   SectionHeadingProps
 } from './types';
-import { splitCamelCaseString } from './utils.js';
+import { splitCamelCaseString } from './utils';
 
 export const PrimaryDetails: React.FC<PrimaryDetailsProps> = ({ title, value, hide = false }) => {
   const titleFormatted = splitCamelCaseString(title);
@@ -151,16 +153,39 @@ export const ActionIconButton: React.FC<ActionIconButtonProps> = ({ title, Icon,
   );
 };
 
-export const KeyValueInRow: React.FC<KeyValueProps> = ({ Key, Value }) => {
+export const KeyValueInRow: React.FC<KeyValueProps> = ({ Key, Value, showFold = false }) => {
+  const [isFolded, setIsFolded] = useState(true);
+
   if (!Value || !Key) return null;
+
+  const handleToggleFold = () => {
+    setIsFolded(!isFolded);
+  };
+
   return (
     <KeyValueGrid container>
       <React.Fragment key={Key}>
-        <KeyValueGridCell item xs={3}>
+        <KeyValueGridCell container xs={3} spacing={1}>
           <KeyValueGridTitle>{Key}</KeyValueGridTitle>
+          {showFold && (
+            <IconButton onClick={handleToggleFold}>
+              {isFolded ? (
+                <UnfoldMoreIcon style={iconXSmall} />
+              ) : (
+                <UnfoldLessIcon style={iconXSmall} />
+              )}
+            </IconButton>
+          )}
         </KeyValueGridCell>
         <Grid item xs={9}>
-          <div>{React.isValidElement(Value) ? Value : String(Value)}</div>
+          <div
+            style={{
+              maxHeight: showFold && isFolded ? '200px' : 'none',
+              overflow: showFold ? 'auto' : 'none'
+            }}
+          >
+            {React.isValidElement(Value) ? Value : String(Value)}
+          </div>
         </Grid>
       </React.Fragment>
     </KeyValueGrid>

diff --git a/src/custom/ResourceDetailFormatters/styles.ts b/src/custom/ResourceDetailFormatters/styles.ts
@@ -306,5 +306,6 @@ export const KeyValueGridTitle = styled(Typography)({
 });
 
 export const KeyValueGridCell = styled(Grid)({
-  placeSelf: 'center'
+  placeSelf: 'center',
+  alignItems: 'center'
 });
diff --git a/src/custom/ResourceDetailFormatters/types.ts b/src/custom/ResourceDetailFormatters/types.ts
@@ -64,6 +64,7 @@ export interface ActionIconButtonProps {
 export interface KeyValueProps {
   Key: string;
   Value: string | number | ReactNode;
+  showFold?: boolean;
 }
 
 export interface EnvironmentFormatterProps {
@@ -264,5 +265,6 @@ export interface GetResourceCleanDataProps {
   dispatchMsgToEditor?: (msg: any) => void;
   activeLabels?: string[];
   showStatus?: boolean;
+  router?: any;
   container?: any;
 }
diff --git a/src/custom/ResourceDetailFormatters/useResourceCleanData.ts b/src/custom/ResourceDetailFormatters/useResourceCleanData.ts
@@ -67,6 +67,7 @@ export const useResourceCleanData = () => {
     resource,
     activeLabels,
     dispatchMsgToEditor,
+    router,
     showStatus = true,
     container
   }: GetResourceCleanDataProps) => {
@@ -110,8 +111,13 @@ export const useResourceCleanData = () => {
         links: [
           { nodeName: parsedSpec?.nodeName, label: 'Node' },
           { namespace: resource?.metadata?.namespace, label: 'Namespace' },
-          { serviceAccount: parsedSpec?.serviceAccountName, label: 'ServiceAccount' }
+          {
+            serviceAccount: parsedSpec?.serviceAccountName,
+            label: 'ServiceAccount',
+            resourceCategory: 'Security'
+          }
         ],
+        router: router,
         dispatchMsgToEditor: dispatchMsgToEditor
       },
       selector: parsedSpec?.selector?.matchLabels