S3 objects lifecycle GUI (#2759) - refactoring

epam · Sep 8, 2022 · 28a40a9 · 28a40a9
1 parent 1d8b4a0
commit 28a40a9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/client/src/components/pipelines/browser/forms/DataStorageEditDialog.js b/client/src/components/pipelines/browser/forms/DataStorageEditDialog.js
@@ -159,6 +159,16 @@ export class DataStorageEditDialog extends React.Component {
       : this.props.isNfsMount;
   }
 
+  @computed
+  get transitionRulesAvailable () {
+    const {
+      dataStorage
+    } = this.props;
+    return dataStorage &&
+      dataStorage.id &&
+      /^s3$/i.test(dataStorage.storageType || dataStorage.type);
+  }
+
   @computed
   get awsRegions () {
     return this.props.awsRegions.loaded ? (this.props.awsRegions.value || []).map(r => r) : [];
@@ -222,7 +232,7 @@ export class DataStorageEditDialog extends React.Component {
                   <Button
                     id="edit-storage-dialog-delete-button"
                     type="danger"
-                    onClick={this.openDeleteDialog}>Delete</Button>
+                    onClick={this.openDeleteDialog}>DELETE</Button>
                 )
               }
             </Row>
@@ -231,12 +241,12 @@ export class DataStorageEditDialog extends React.Component {
             <Row type="flex" justify="end">
               <Button
                 id="edit-storage-dialog-cancel-button"
-                onClick={this.props.onCancel}>Cancel</Button>
+                onClick={this.props.onCancel}>CANCEL</Button>
               <Button
                 id="edit-storage-dialog-save-button"
                 type="primary"
                 htmlType="submit"
-                onClick={this.handleSubmit}>Save</Button>
+                onClick={this.handleSubmit}>SAVE</Button>
             </Row>
           </Col>
         </Row>
@@ -575,9 +585,7 @@ export class DataStorageEditDialog extends React.Component {
                   objectType="DATA_STORAGE" />
               </Tabs.TabPane>
             }
-            {this.props.dataStorage &&
-            this.props.dataStorage.id &&
-            /^s3$/i.test(this.props.dataStorage.type) && (
+            {this.transitionRulesAvailable && (
               <Tabs.TabPane key="transitionRules" tab="Transition rules">
                 <LifeCycleRules
                   storageId={this.props.dataStorage.id}

diff --git a/client/src/components/pipelines/browser/forms/life-cycle-rules/index.js b/client/src/components/pipelines/browser/forms/life-cycle-rules/index.js
@@ -236,7 +236,7 @@ class LifeCycleRules extends React.Component {
             </Tooltip>
           ) : null}
         </td>
-        <td style={{padding: '0 5px'}}>
+        <td style={{padding: '0 5px', textAlign: 'right'}}>
           {controls}
         </td>
       </tr>

diff --git a/...components/pipelines/browser/forms/life-cycle-rules/modals/life-cycle-edit-modal/index.js b/...components/pipelines/browser/forms/life-cycle-rules/modals/life-cycle-edit-modal/index.js
@@ -357,14 +357,14 @@ class LifeCycleEditModal extends React.Component {
         footer={
           <Row type="flex" justify="end">
             <Button onClick={this.onCancel}>
-              Cancel
+              CANCEL
             </Button>
             <Button
               type="primary"
               onClick={this.handleSubmit}
               disabled={pending || !this.modified}
             >
-              Save
+              SAVE
             </Button>
           </Row>
         }

diff --git a/...ponents/pipelines/browser/forms/life-cycle-rules/modals/life-cycle-history-modal/index.js b/...ponents/pipelines/browser/forms/life-cycle-rules/modals/life-cycle-history-modal/index.js
@@ -234,7 +234,7 @@ class LifeCycleHistoryModal extends React.Component {
               onClick={onOk}
               type="primary"
             >
-              Ok
+              OK
             </Button>
           </Row>
         )}
-Original file line number
+Diff line change
@@ Expand Up / @@ -234,7 +234,7 @@ class LifeCycleHistoryModal extends React.Component { @@
                   onClick={onOk}
                   type="primary"
                 >
-                  Ok
+                  OK
                 </Button>
               </Row>
             )}
@@ Expand Down @@