Merge pull request #1534 from memphisdev/RND-140-enable-configuration…

…-of-prods-cons-gc-to-cloud-users-ui-side Enable configuration of prods/cons GC to cloud users - UI side
superstreamlabs · Dec 19, 2023 · edf9925 · edf9925
2 parents 1ebe33d + 101a933
commit edf9925
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 38 deletions.
diff --git a/ui_src/src/domain/administration/clusterConfiguration/index.js b/ui_src/src/domain/administration/clusterConfiguration/index.js
@@ -113,42 +113,31 @@ function ClusterConfiguration() {
             {!isLoading && (
                 <>
                     <div className="configuration-body">
-                        {isCloud() ? (
-                            <SliderRow
-                                title="DEAD LETTERED MESSAGES RETENTION IN HOURS"
-                                desc="Amount of hours to retain dead lettered messages in a DLS"
-                                value={formFields?.dls_retention}
-                                img={DeadLetterInHours}
-                                min={1}
-                                max={30}
-                                unit={'h'}
-                                onChanges={(e) => handleChange('dls_retention', e)}
-                            />
-                        ) : (
+                        <SliderRow
+                            title="DEAD LETTERED MESSAGES RETENTION IN HOURS"
+                            desc="Amount of hours to retain dead lettered messages in a DLS"
+                            value={formFields?.dls_retention}
+                            img={DeadLetterInHours}
+                            min={1}
+                            max={30}
+                            unit={'h'}
+                            onChanges={(e) => handleChange('dls_retention', e)}
+                        />
+                        <SliderRow
+                            title="DISCONNECTED PRODUCERS AND CONSUMERS RETENTION"
+                            desc="Amount of hours to retain inactive producers and consumers"
+                            value={formFields?.gc_producer_consumer_retention_hours}
+                            img={DeadLetterInHours}
+                            min={1}
+                            max={48}
+                            unit={'h'}
+                            onChanges={(e) => handleChange('gc_producer_consumer_retention_hours', e)}
+                        />
+                        {!isCloud() && (
                             <>
-                                <SliderRow
-                                    title="DEAD LETTERED MESSAGES RETENTION IN HOURS"
-                                    desc="Amount of hours to retain dead lettered messages in a DLS"
-                                    value={formFields?.dls_retention}
-                                    img={DeadLetterInHours}
-                                    min={1}
-                                    max={30}
-                                    unit={'h'}
-                                    onChanges={(e) => handleChange('dls_retention', e)}
-                                />
-                                <SliderRow
-                                    title="DISCONNECTED PRODUCERS AND CONSUMERS RETENTION"
-                                    desc="Amount of hours to retain inactive producerd and consumers"
-                                    value={formFields?.gc_producer_consumer_retention_hours}
-                                    img={DeadLetterInHours}
-                                    min={1}
-                                    max={48}
-                                    unit={'h'}
-                                    onChanges={(e) => handleChange('gc_producer_consumer_retention_hours', e)}
-                                />
                                 <SliderRow
                                     title="MAX MESSAGE SIZE"
-                                    desc="Maximum  message size (payload + headers) in megabytes"
+                                    desc="Maximum message size (payload + headers) in megabytes"
                                     value={formFields?.max_msg_size_mb}
                                     img={DeadLetterInHours}
                                     min={1}
@@ -171,12 +160,11 @@ function ClusterConfiguration() {
                                     desc="(if configured) The interval which the broker will migrate a batch of messages to the second storage tier"
                                     img={TieredStorageInterval}
                                     value={formFields?.tiered_storage_time_sec}
-                                    onChanges={(e, err) => {
-                                        handleChange('tiered_storage_time_sec', e, err);
-                                    }}
+                                    onChanges={(e, err) => handleChange('tiered_storage_time_sec', e, err)}
                                 />
                             </>
                         )}
+
                         {localStorage.getItem(LOCAL_STORAGE_ENV) !== 'docker' && !isCloud() && (
                             <>
                                 <InputRow

diff --git a/ui_src/src/domain/administration/softwareUpdates/style.scss b/ui_src/src/domain/administration/softwareUpdates/style.scss
@@ -1,9 +1,12 @@
 .softwate-updates-container {
-    height: 100%;
-    width: 100%;
     padding: 20px 20px 20px 0px;
     overflow-y: auto;
     position: relative;
+    height: calc(100% - 40px);
+    width: calc(100% - 350px);
+    min-width: 800px;
+    min-height: 530px;
+    right: 20px;
     .rows {
         width: 100%;
         height: 100%;