Merge branch 'UOF-61_merge-latest-uof' of github.com:topcoder-platform/platform-ui into UOF-61_merge-latest-uof

Author: jmgasper

src/libs/ui/lib/components/button/link-button/LinkButton.tsx

@@ -4,8 +4,8 @@ import { omit, pick } from 'lodash'
 
 import Button, { ButtonProps } from '../Button'
 
-export type LinkButtonProps = ButtonProps & LinkProps & {
-    to: To
+export type LinkButtonProps = ButtonProps & Omit<LinkProps, 'to'> & {
+    to?: To
 }
 
 const linkPropsList: string[] = [

src/libs/ui/lib/components/content-layout/ContentLayout.module.scss

@@ -3,6 +3,7 @@
 .content {
     flex: 1 1 auto;
     display: flex;
+    padding-bottom: $sp-4;
 
     .content-outer {
         max-width: $xxl-min;

src/libs/ui/lib/components/form/Form.tsx

@@ -12,7 +12,7 @@ import {
 } from 'react'
 import classNames from 'classnames'
 
-import { Button } from '../button'
+import { LinkButton } from '../button'
 import { IconOutline } from '../svgs'
 import '../../styles/index.scss'
 
@@ -174,9 +174,11 @@ const Form: <
                 || !!props.shouldDisableButton?.(isPrimaryGroup, index)
 
             return (
-                <Button
+                <LinkButton
                     {...button}
                     {...{ [button.buttonStyle ?? 'primary']: true }}
+                    to={button.route ?? button.url}
+                    type={button.type ?? (button.isReset ? 'reset' : button.isSubmit ? 'submit' : 'button')}
                     size='lg'
                     key={button.label || `button-${index}`}
                     disabled={disabled}