Merge pull request #199 from webzard-io/feat/resources

fix: change some styles
webzard-io · Nov 18, 2024 · 67f587a · 67f587a
2 parents 2c05fa9 + 4e9c7dd
commit 67f587a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/packages/refine/package.json b/packages/refine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.1.16",
+  "version": "0.1.18-alpha.1",
   "type": "module",
   "files": [
     "dist",

diff --git a/packages/refine/src/App.tsx b/packages/refine/src/App.tsx
@@ -157,8 +157,8 @@ function App() {
   const globalStore = useMemo(() => {
     return new GlobalStore(
       {
-        apiUrl: '/api/sks-proxy/api/v1/clusters/yangfeng-test/proxy',
-        watchWsApiUrl: 'api/sks-ws/sks-proxy/api/v1/clusters/yangfeng-test/proxy',
+        apiUrl: '/api/sks-proxy/api/v1/clusters/vm-workload/proxy',
+        watchWsApiUrl: 'api/sks-ws/sks-proxy/api/v1/clusters/vm-workload/proxy',
         prefix: 'default',
         plugins: ProviderPlugins,
       },

diff --git a/packages/refine/src/components/Form/RefineFormContent.tsx b/packages/refine/src/components/Form/RefineFormContent.tsx
@@ -102,7 +102,7 @@ export const RefineFormContent = <Model extends ResourceModel>(props: Props<Mode
               key={c.key}
               label={c.label}
               colon={false}
-              labelCol={{ flex: '0 0 216px' }}
+              labelCol={{ flex: `0 0 ${config?.formConfig?.labelWidth || '216px'}` }}
               help={fieldState.error?.message}
               validateStatus={fieldState.invalid ? 'error' : undefined}
             >

diff --git a/packages/refine/src/components/ResourceLink/index.tsx b/packages/refine/src/components/ResourceLink/index.tsx
@@ -1,8 +1,9 @@
 import { Link } from '@cloudtower/eagle';
 import { css } from '@linaria/core';
 import { useGo, useNavigation } from '@refinedev/core';
-
 import React from 'react';
+import { ValueDisplay } from '../ValueDisplay';
+
 
 type Props = {
   resourceKind: string;
@@ -30,9 +31,11 @@ export const ResourceLink: React.FC<Props> = props => {
     });
   };
 
-  return (
+  return resourceId ? (
     <Link className={LinkStyle} onClick={onClick} title={resourceId}>
       {resourceId}
     </Link>
+  ) : (
+    <ValueDisplay value="" />
   );
 };
diff --git a/packages/refine/src/components/ShowContent/ShowContent.tsx b/packages/refine/src/components/ShowContent/ShowContent.tsx
@@ -303,15 +303,15 @@ export const ShowContent = <Model extends ResourceModel>(props: Props<Model>) =>
   );
   const tabs = (
     <Tabs
-      tabs={(showConfig.tabs || []).map(tab => {
+      tabs={(showConfig.tabs || []).map((tab, tabIndex) => {
         return {
           title: tab.title,
           key: tab.key,
           children: (
             <div
               className={cx(
                 TabContentStyle,
-                tab.groups.length <= 1 && FullTabContentStyle
+                tab.groups.length <= 1 && tabIndex !== 0 && FullTabContentStyle
               )}
             >
               {tab.groups?.map(group => {

diff --git a/packages/refine/src/hooks/useEagleTable/columns.tsx b/packages/refine/src/hooks/useEagleTable/columns.tsx
@@ -44,7 +44,6 @@ import {
   PersistentVolumeModel,
   PersistentVolumeClaimModel,
 } from '../../models';
-import { parseSi } from '../../utils/unit';
 
 const DashedTitleStyle = css`
   border-bottom: 1px dashed rgba(107, 128, 167, 0.6);
@@ -147,12 +146,12 @@ export const NameSpaceColumnRenderer = <Model extends ResourceModel>(
 
 export const StateDisplayColumnRenderer = <
   Model extends
-    | WorkloadModel
-    | CronJobModel
-    | PodModel
-    | ServiceModel
-    | DaemonSetModel
-    | JobModel,
+  | WorkloadModel
+  | CronJobModel
+  | PodModel
+  | ServiceModel
+  | DaemonSetModel
+  | JobModel,
 >(
   i18n: I18nType
 ): Column<Model> => {
@@ -645,13 +644,13 @@ export const PVCapacityColumnRenderer = <Model extends PersistentVolumeModel>(
   return {
     key: 'capacity',
     display: true,
-    dataIndex: ['spec', 'capacity', 'storage'],
+    dataIndex: ['storageBytes'],
     title: i18n.t('dovetail.capacity'),
     width: 120,
     sortable: true,
     align: 'right',
     render(value) {
-      return <Units.Byte rawValue={parseSi(value)} decimals={1} />;
+      return <Units.Byte rawValue={value} decimals={2} />;
     },
   };
 };

diff --git a/packages/refine/src/models/persistent-volume.ts b/packages/refine/src/models/persistent-volume.ts
@@ -1,6 +1,8 @@
 import { GlobalStore, Unstructured } from 'k8s-api-provider';
 import type { PersistentVolume } from 'kubernetes-types/core/v1';
+import { get } from 'lodash-es';
 import { ResourceState } from 'src/constants';
+import { parseSi } from '../utils/unit';
 import { ResourceModel } from './resource-model';
 
 type RequiredPersistentVolume = Required<PersistentVolume> & Unstructured;
@@ -47,4 +49,8 @@ export class PersistentVolumeModel extends ResourceModel {
   get pvcNamespace() {
     return this._rawYaml.spec.claimRef?.namespace;
   }
+
+  get storageBytes() {
+    return parseSi(get(this._rawYaml, ['spec', 'capacity', 'storage']));
+  }
 }
diff --git a/packages/refine/src/types/resource.ts b/packages/refine/src/types/resource.ts
@@ -57,6 +57,7 @@ export type ResourceConfig<Model extends ResourceModel = ResourceModel> = {
     transformApplyValues?: (values: Record<string, unknown>) => Model['_rawYaml'];
     formTitle?: string | ((action: 'create' | 'edit') => string);
     formDesc?: string | ((action: 'create' | 'edit') => string);
+    labelWidth?: string;
     formatError?: (errorBody: unknown) => string;
     refineCoreProps?: UseFormProps['refineCoreProps'];
     useFormProps?: UseFormProps;