big big problem

kyma-project · Oct 6, 2023 · 0806c66 · 0806c66
1 parent 44bd0fd
commit 0806c66
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/src/resources/Namespaces/MemoryQuotas.js b/src/resources/Namespaces/MemoryQuotas.js
@@ -1,8 +1,8 @@
 import React from 'react';
-import { FormItem, FormInput, FormLabel } from 'fundamental-react';
 import * as jp from 'jsonpath';
 
 import { Dropdown } from 'shared/components/Dropdown/Dropdown';
+import { Input, FormItem } from '@ui5/webcomponents-react';
 
 export function MemoryInput({
   label,
@@ -32,27 +32,25 @@ export function MemoryInput({
   };
 
   return (
-    <FormItem>
-      <FormLabel required={required}>{label}</FormLabel>
-      <div className="memory-input">
-        <FormInput
-          compact
-          type="number"
-          min="0"
-          required={required}
-          value={numericValue}
-          step="any"
-          onChange={e => setValue(e.target.value + selectedUnit)}
-          {...otherProps}
-        />
-        <Dropdown
-          options={options}
-          required={required}
-          selectedKey={selectedUnit}
-          onSelect={(_, { key }) => setValue(numericValue.toString() + key)}
-          {...otherProps}
-        />
-      </div>
+    <FormItem label={label}>
+      {/* <FormLabel required={required}>{label}</FormLabel> */}
+      {/* <div className="memory-input"> */}
+      <Input
+        type="Number"
+        min="0"
+        required={required}
+        value={numericValue}
+        onInput={e => setValue(e.target.value + selectedUnit)}
+        {...otherProps}
+      />
+      <Dropdown
+        options={options}
+        required={required}
+        selectedKey={selectedUnit}
+        onSelect={(_, { key }) => setValue(numericValue.toString() + key)}
+        {...otherProps}
+      />
+      {/* </div> */}
     </FormItem>
   );
 }
diff --git a/src/shared/ResourceForm/components/ResourceForm.js b/src/shared/ResourceForm/components/ResourceForm.js
@@ -13,6 +13,7 @@ import { KeyValueField, K8sNameField } from '../fields';
 import * as jp from 'jsonpath';
 
 import './ResourceForm.scss';
+import { Form } from '@ui5/webcomponents-react';
 
 export function ResourceForm({
   pluralKind, // used for the request path
@@ -139,7 +140,7 @@ export function ResourceForm({
     : editor;
 
   return (
-    <section className={classnames('resource-form', className)}>
+    <Form className={classnames('resource-form', className)}>
       {presetsSelector}
       {onlyYaml ? null : (
         <ModeSelector
@@ -225,6 +226,6 @@ export function ResourceForm({
           </div>
         )}
       </form>
-    </section>
+    </Form>
   );
 }