Merge pull request #8004 from mdrillin/ENTESB-12898

DV details page updates

app/ui-react/packages/ui/src/Data/Virtualizations/PublishStatusWithProgress.css

@@ -9,8 +9,9 @@
     margin-right: 15px;
 }
 
-.publish-status-with-progress-margin10 {
+.publish-status-with-progress-ok-icon {
     margin-right: 10px;
+    margin-top: 10px;
 }
 
 .publish-status-with-progress_text {

app/ui-react/packages/ui/src/Data/Virtualizations/PublishStatusWithProgress.tsx

@@ -85,7 +85,7 @@ export const PublishStatusWithProgress: React.FunctionComponent<IPublishStatusWi
           color={'#49B720'}
           height={'1.25rem'}
           width={'1.25rem'}
-          className={'publish-status-with-progress-margin10'}
+          className={'publish-status-with-progress-ok-icon'}
         />
       )}
       <span className={'publish-status-with-progress_text'}>

app/ui-react/packages/ui/src/Data/Virtualizations/SqlClientForm.css

@@ -1,3 +1,3 @@
 .sql-client-form__submitButton {
-  margin-top: 5;
+  margin-top: 8px;
 }

app/ui-react/packages/ui/src/Data/Virtualizations/SqlClientForm.tsx

@@ -34,15 +34,16 @@ export const SqlClientForm: React.FunctionComponent<
         </Card>
       </StackItem>
       <StackItem isFilled={false}>
-        <Button
-          data-testid={'sql-client-form-submit-button'}
-          className={'sql-client-form__submitButton'}
-          isDisabled={false}
-          variant={ButtonVariant.primary}
-          onClick={props.handleSubmit}
-        >
-          {props.i18nSubmit}
-        </Button>
+        <div className={'sql-client-form__submitButton'}>
+          <Button
+            data-testid={'sql-client-form-submit-button'}
+            isDisabled={false}
+            variant={ButtonVariant.primary}
+            onClick={props.handleSubmit}
+          >
+            {props.i18nSubmit}
+          </Button>
+        </div>
       </StackItem>
     </Stack>
   );

app/ui-react/syndesis/src/modules/data/pages/VirtualizationEditorPage.tsx

@@ -4,7 +4,6 @@ import {
   VirtualizationPublishingDetails,
 } from '@syndesis/models';
 import {
-  IVirtualizationAction,
   PageSection,
   VirtualizationBreadcrumb,
   VirtualizationDetailsHeader,
@@ -49,12 +48,12 @@ export interface IVirtualizationEditorPageProps {
    */
   actions?: VirtualizationActionId[];
 
-  deleteActionCustomProps?: IVirtualizationAction;
-  exportActionCustomProps?: IVirtualizationAction;
-  publishActionCustomProps?: IVirtualizationAction;
-  saveActionCustomProps?: IVirtualizationAction;
-  startActionCustomProps?: IVirtualizationAction;
-  stopActionCustomProps?: IVirtualizationAction;
+  deleteActionCustomProps?: any;
+  exportActionCustomProps?: any;
+  publishActionCustomProps?: any;
+  saveActionCustomProps?: any;
+  startActionCustomProps?: any;
+  stopActionCustomProps?: any;
 
   /**
    * The breadcrumb kebab menu items. Leave `undefined` if default kebab menu items are wanted.

app/ui-react/syndesis/src/modules/data/pages/VirtualizationMetricsPage.tsx

@@ -12,6 +12,9 @@ import {
 } from '@syndesis/utils';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
+import {
+  VirtualizationActionId,
+} from '../shared/VirtualizationActionContainer';
 import {
   IVirtualizationEditorPageRouteParams,
   IVirtualizationEditorPageRouteState,
@@ -73,6 +76,9 @@ export const VirtualizationMetricsPage: React.FunctionComponent = () => {
       routeParams={params}
       routeState={state}
       virtualization={virtualization}
+      items={[VirtualizationActionId.Stop, VirtualizationActionId.Delete]}
+      actions={[VirtualizationActionId.Publish]}
+      publishActionCustomProps={{ as: 'default' }}
     >
       <PageSection>
         <WithLoader

app/ui-react/syndesis/src/modules/data/pages/VirtualizationSqlClientPage.tsx

@@ -7,6 +7,7 @@ import * as React from 'react';
 import { ApiError } from '../../../shared';
 import resolvers from '../../resolvers';
 import { 
+  VirtualizationActionId,
   WithVirtualizationSqlClientForm 
 } from '../shared';
 import {
@@ -47,6 +48,9 @@ export const VirtualizationSqlClientPage: React.FunctionComponent = () => {
       routeParams={params}
       routeState={state}
       virtualization={virtualization}
+      items={[VirtualizationActionId.Stop, VirtualizationActionId.Delete]}
+      actions={[VirtualizationActionId.Publish]}
+      publishActionCustomProps={{ as: 'default' }}
     >
       <WithLoader
         error={error !== false}

app/ui-react/syndesis/src/modules/data/pages/VirtualizationVersionsPage.tsx

@@ -154,6 +154,9 @@ export const VirtualizationVersionsPage: React.FunctionComponent = () => {
       routeParams={params}
       routeState={state}
       virtualization={virtualization}
+      items={[VirtualizationActionId.Stop, VirtualizationActionId.Delete]}
+      actions={[VirtualizationActionId.Publish]}
+      publishActionCustomProps={{ as: 'default' }}
     >
       <PageSection>
         <WithLoader

app/ui-react/syndesis/src/modules/data/pages/VirtualizationViewsPage.tsx

@@ -23,6 +23,9 @@ import { UIContext } from '../../../app';
 import i18n from '../../../i18n';
 import { ApiError } from '../../../shared';
 import resolvers from '../../resolvers';
+import {
+  VirtualizationActionId,
+} from '../shared/VirtualizationActionContainer';
 import {
   IVirtualizationEditorPageRouteParams,
   IVirtualizationEditorPageRouteState,
@@ -155,6 +158,9 @@ export const VirtualizationViewsPage: React.FunctionComponent = () => {
       routeParams={params}
       routeState={state}
       virtualization={virtualization}
+      items={[VirtualizationActionId.Stop, VirtualizationActionId.Delete]}
+      actions={[VirtualizationActionId.Publish]}
+      publishActionCustomProps={{ as: 'default' }}
     >
       <WithListViewToolbarHelpers
         defaultFilterType={filterByName}

app/ui-react/syndesis/src/modules/data/shared/VirtualizationActionContainer.tsx

@@ -51,42 +51,42 @@ interface IPromptActionOptions {
 }
 
 /**
- * @property {IVirtualizationAction} deleteActionProps - the customization of the delete action or `undefined` if the
+ * @property {any} deleteActionProps - the customization of the delete action or `undefined` if the
  * default action properties are wanted
  * @example { disabled: false }
- * @property {IVirtualizationAction} exportActionProps - the customization of the export action or `undefined` if the
+ * @property {any} exportActionProps - the customization of the export action or `undefined` if the
  * default action properties are wanted
  * @example { as: 'primary', i18nLabel: 'My Export' }
  * @property {VirtualizationActionId[]} includeActions - the IDs of the actions wanted as buttons.
  * Leave `undefined` if the default actions are wanted. Set to an empty array of no action buttons are wanted.
  * @property {VirtualizationActionId[]} includeItems - the IDs of the actions wanted as kebab menu items.
  * Leave `undefined` if the default actions are wanted. Set to an empty array if no kebab menu is wanted.
  * @property {H.LocationDescriptorObject} postDeleteHref - the virtualization whose actions are being requested
- * @property {IVirtualizationAction} publishActionProps - the customization of the publish action or `undefined` if the
+ * @property {any} publishActionProps - the customization of the publish action or `undefined` if the
  * default action properties are wanted
- * @property {IVirtualizationAction} revertActionProps - the customization of the revert action or `undefined` if the
+ * @property {any} revertActionProps - the customization of the revert action or `undefined` if the
  * default action properties are wanted
- * @property {IVirtualizationAction} revision - the revision for action or `undefined` if not required.
- * @property {IVirtualizationAction} saveActionProps - the customization of the save action or `undefined` if the
+ * @property {any} revision - the revision for action or `undefined` if not required.
+ * @property {any} saveActionProps - the customization of the save action or `undefined` if the
  * default action properties are wanted
- * @property {IVirtualizationAction} startActionProps - the customization of the start action or `undefined` if the
+ * @property {any} startActionProps - the customization of the start action or `undefined` if the
  * default action properties are wanted
- * @property {IVirtualizationAction} stopActionProps - the customization of the stop action or `undefined` if the
+ * @property {any} stopActionProps - the customization of the stop action or `undefined` if the
  * default action properties are wanted
  * @property {Virtualization} virtualization - the virtualization whose actions are being requested
  */
 export interface IVirtualizationActionContainerProps {
-  deleteActionProps?: IVirtualizationAction;
-  exportActionProps?: IVirtualizationAction;
+  deleteActionProps?: any;
+  exportActionProps?: any;
   includeActions?: VirtualizationActionId[];
   includeItems?: VirtualizationActionId[];
   postDeleteHref?: H.LocationDescriptorObject;
-  publishActionProps?: IVirtualizationAction;
-  revertActionProps?: IVirtualizationAction;
+  publishActionProps?: any;
+  revertActionProps?: any;
   revision?: number;
-  saveActionProps?: IVirtualizationAction;
-  startActionProps?: IVirtualizationAction;
-  stopActionProps?: IVirtualizationAction;
+  saveActionProps?: any;
+  startActionProps?: any;
+  stopActionProps?: any;
   virtualization: Virtualization;
 }
 
@@ -549,7 +549,10 @@ export const VirtualizationActionContainer: React.FunctionComponent<
           }
           break;
         case VirtualizationActionId.Publish:
-          if (canPublish(props.virtualization)) {
+          // The publish is included, but may be disabled
+          if (!canPublish(props.virtualization)) {
+            actions.push(createPublishAction({ disabled: true }));
+          } else {
             actions.push(createPublishAction(props.publishActionProps));
           }
           break;