From 7ee27f0fcb72f454fd8b3c16cca0a3fd766e0a0c Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 09:45:42 -0700
Subject: [PATCH 1/8] refactor(ui): add default values for deadman condition

---
 ui/src/alerting/constants/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/src/alerting/constants/index.ts b/ui/src/alerting/constants/index.ts
index fd466c0b0cf..448cddf7516 100644
--- a/ui/src/alerting/constants/index.ts
+++ b/ui/src/alerting/constants/index.ts
@@ -72,6 +72,8 @@ export const DEFAULT_DEADMAN_CHECK: Partial<DeadmanCheck> = {
   reportZero: DEFAULT_CHECK_REPORT_ZERO,
   level: DEFAULT_DEADMAN_LEVEL,
   statusMessageTemplate: DEFAULT_STATUS_MESSAGE,
+  timeSince: '90s',
+  staleTime: '10m',
 }
 
 export const CHECK_QUERY_FIXTURE: DashboardQuery = {

From 56b5f07a8fa8b2118a40b4234e1f298ca6601723 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 09:46:00 -0700
Subject: [PATCH 2/8] refactor(ui): limit values to 2 decimal places when
 dragging thereshold handles

---
 ui/src/shared/components/ThresholdMarkers.tsx | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/ui/src/shared/components/ThresholdMarkers.tsx b/ui/src/shared/components/ThresholdMarkers.tsx
index d79d119ee92..61dc021f1c3 100644
--- a/ui/src/shared/components/ThresholdMarkers.tsx
+++ b/ui/src/shared/components/ThresholdMarkers.tsx
@@ -1,6 +1,7 @@
 // Libraries
 import React, {useRef, FunctionComponent} from 'react'
 import {Scale} from '@influxdata/giraffe'
+import {round} from 'lodash'
 
 // Components
 import RangeThresholdMarkers from 'src/shared/components/RangeThresholdMarkers'
@@ -13,6 +14,9 @@ import {clamp} from 'src/shared/utils/vis'
 // Types
 import {Threshold} from 'src/types'
 
+// Constants
+const DRAGGABLE_THRESHOLD_PRECISION = 2
+
 interface Props {
   thresholds: Threshold[]
   onSetThresholds: (newThresholds: Threshold[]) => void
@@ -52,7 +56,21 @@ const ThresholdMarkers: FunctionComponent<Props> = ({
       i === index ? nextThreshold : t
     )
 
-    onSetThresholds(nextThresholds)
+    const roundedThresholds = nextThresholds.map(nt => {
+      if (nt.type === 'greater' || nt.type === 'lesser') {
+        return {...nt, value: round(nt.value, DRAGGABLE_THRESHOLD_PRECISION)}
+      }
+
+      if (nt.type === 'range') {
+        return {
+          ...nt,
+          min: round(nt.min, DRAGGABLE_THRESHOLD_PRECISION),
+          max: round(nt.max, DRAGGABLE_THRESHOLD_PRECISION),
+        }
+      }
+    })
+
+    onSetThresholds(roundedThresholds)
   }
 
   return (

From 0df7da0b06469c87dfd3f08d1b0aa17df5b5b3a6 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 10:35:54 -0700
Subject: [PATCH 3/8] refactor(ui): prevent system buckets from being deleted
 or renamed

---
 ui/src/buckets/components/BucketCard.tsx | 24 +++++++++++++++++-------
 ui/src/buckets/constants/index.ts        |  7 +++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ui/src/buckets/components/BucketCard.tsx b/ui/src/buckets/components/BucketCard.tsx
index 3921ce89f3b..29103b77ef9 100644
--- a/ui/src/buckets/components/BucketCard.tsx
+++ b/ui/src/buckets/components/BucketCard.tsx
@@ -15,6 +15,9 @@ import BucketContextMenu from 'src/buckets/components/BucketContextMenu'
 import BucketAddDataButton from 'src/buckets/components/BucketAddDataButton'
 import {FeatureFlag} from 'src/shared/utils/featureFlag'
 
+// Constants
+import {isSystemBucket} from 'src/buckets/constants/index'
+
 // Types
 import {Bucket} from 'src/types'
 import {DataLoaderType} from 'src/types/dataLoaders'
@@ -40,7 +43,12 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
       <ResourceCard
         testID="bucket--card"
         contextMenu={
-          <BucketContextMenu bucket={bucket} onDeleteBucket={onDeleteBucket} />
+          !isSystemBucket(bucket) && (
+            <BucketContextMenu
+              bucket={bucket}
+              onDeleteBucket={onDeleteBucket}
+            />
+          )
         }
         name={
           <ResourceCard.Name
@@ -61,12 +69,14 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
             onAddLineProtocol={this.handleAddLineProtocol}
             onAddScraper={this.handleAddScraper}
           />
-          <Button
-            text="Rename"
-            testID="bucket-rename"
-            size={ComponentSize.ExtraSmall}
-            onClick={this.handleRenameBucket}
-          />
+          {!isSystemBucket(bucket) && (
+            <Button
+              text="Rename"
+              testID="bucket-rename"
+              size={ComponentSize.ExtraSmall}
+              onClick={this.handleRenameBucket}
+            />
+          )}
           <FeatureFlag name="deleteWithPredicate">
             <Button
               text="Delete Data By Filter"
diff --git a/ui/src/buckets/constants/index.ts b/ui/src/buckets/constants/index.ts
index 2f9c69e6e63..85b64089b50 100644
--- a/ui/src/buckets/constants/index.ts
+++ b/ui/src/buckets/constants/index.ts
@@ -1 +1,8 @@
+import {Bucket} from 'src/types'
+import {startsWith} from 'lodash'
+
 export const MIN_RETENTION_SECONDS = 3600
+
+export const isSystemBucket = (bucket: Bucket): boolean => {
+  return startsWith(bucket.name, '_')
+}

From a5c9b94cca9a7a2cc6d9c1db351a7930805893bf Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 10:39:24 -0700
Subject: [PATCH 4/8] refactor(ui): indicate which buckets are system buckets

---
 ui/src/buckets/components/BucketAddDataButton.scss | 4 ++++
 ui/src/buckets/components/BucketCard.tsx           | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/src/buckets/components/BucketAddDataButton.scss b/ui/src/buckets/components/BucketAddDataButton.scss
index 3e49ed3fbc1..a2a9a0192e7 100644
--- a/ui/src/buckets/components/BucketAddDataButton.scss
+++ b/ui/src/buckets/components/BucketAddDataButton.scss
@@ -50,3 +50,7 @@
     color: $g13-mist;
   }
 }
+
+.system-bucket {
+  color: mix($c-honeydew, $g13-mist);
+}
\ No newline at end of file
diff --git a/ui/src/buckets/components/BucketCard.tsx b/ui/src/buckets/components/BucketCard.tsx
index 29103b77ef9..260839ffbae 100644
--- a/ui/src/buckets/components/BucketCard.tsx
+++ b/ui/src/buckets/components/BucketCard.tsx
@@ -57,7 +57,12 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
             name={bucket.name}
           />
         }
-        metaData={[<>Retention: {bucket.ruleString}</>]}
+        metaData={[
+          isSystemBucket(bucket) && (
+            <span className="system-bucket">System Bucket</span>
+          ),
+          <>Retention: {bucket.ruleString}</>,
+        ]}
       >
         <FlexBox
           direction={FlexDirection.Row}

From 193f1c9555c648dec8169cfc5f6ae85fab343ed2 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 11:09:25 -0700
Subject: [PATCH 5/8] refactor(ui): prevent user from creating buckets starting
 with _

---
 ui/src/buckets/components/BucketCard.tsx      |  6 +-
 .../buckets/components/BucketOverlayForm.tsx  | 57 ++++++++++++-------
 .../components/CreateBucketOverlay.tsx        | 25 ++------
 .../components/UpdateBucketOverlay.tsx        | 25 ++------
 ui/src/buckets/constants/index.ts             |  5 +-
 5 files changed, 49 insertions(+), 69 deletions(-)

diff --git a/ui/src/buckets/components/BucketCard.tsx b/ui/src/buckets/components/BucketCard.tsx
index 260839ffbae..e10558205a3 100644
--- a/ui/src/buckets/components/BucketCard.tsx
+++ b/ui/src/buckets/components/BucketCard.tsx
@@ -43,7 +43,7 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
       <ResourceCard
         testID="bucket--card"
         contextMenu={
-          !isSystemBucket(bucket) && (
+          !isSystemBucket(bucket.name) && (
             <BucketContextMenu
               bucket={bucket}
               onDeleteBucket={onDeleteBucket}
@@ -58,7 +58,7 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
           />
         }
         metaData={[
-          isSystemBucket(bucket) && (
+          isSystemBucket(bucket.name) && (
             <span className="system-bucket">System Bucket</span>
           ),
           <>Retention: {bucket.ruleString}</>,
@@ -74,7 +74,7 @@ class BucketRow extends PureComponent<Props & WithRouterProps> {
             onAddLineProtocol={this.handleAddLineProtocol}
             onAddScraper={this.handleAddScraper}
           />
-          {!isSystemBucket(bucket) && (
+          {!isSystemBucket(bucket.name) && (
             <Button
               text="Rename"
               testID="bucket-rename"
diff --git a/ui/src/buckets/components/BucketOverlayForm.tsx b/ui/src/buckets/components/BucketOverlayForm.tsx
index 51773fa5f17..8e9a20b09e5 100644
--- a/ui/src/buckets/components/BucketOverlayForm.tsx
+++ b/ui/src/buckets/components/BucketOverlayForm.tsx
@@ -8,6 +8,7 @@ import Retention from 'src/buckets/components/Retention'
 
 // Constants
 import {MIN_RETENTION_SECONDS} from 'src/buckets/constants'
+import {isSystemBucket} from 'src/buckets/constants/index'
 
 // Types
 import {
@@ -18,7 +19,6 @@ import {
 
 interface Props {
   name: string
-  nameErrorMessage: string
   retentionSeconds: number
   ruleType: 'expire'
   onSubmit: (e: FormEvent<HTMLFormElement>) => void
@@ -26,7 +26,7 @@ interface Props {
   onChangeRetentionRule: (seconds: number) => void
   onChangeRuleType: (t: 'expire') => void
   onChangeInput: (e: ChangeEvent<HTMLInputElement>) => void
-  nameInputStatus: ComponentStatus
+  disableRenaming: boolean
   buttonText: string
 }
 
@@ -37,34 +37,38 @@ export default class BucketOverlayForm extends PureComponent<Props> {
       onSubmit,
       ruleType,
       buttonText,
-      nameErrorMessage,
       retentionSeconds,
-      nameInputStatus,
+      disableRenaming,
       onCloseModal,
       onChangeInput,
       onChangeRuleType,
       onChangeRetentionRule,
     } = this.props
 
+    const nameInputStatus = disableRenaming && ComponentStatus.Disabled
+
     return (
       <Form onSubmit={onSubmit}>
         <Grid>
           <Grid.Row>
             <Grid.Column>
-              <Form.Element
+              <Form.ValidationElement
+                value={name}
                 label="Name"
-                errorMessage={nameErrorMessage}
                 helpText={this.nameHelpText}
+                validationFunc={this.handleNameValidation}
               >
-                <Input
-                  placeholder="Give your bucket a name"
-                  name="name"
-                  autoFocus={true}
-                  value={name}
-                  onChange={onChangeInput}
-                  status={nameInputStatus}
-                />
-              </Form.Element>
+                {status => (
+                  <Input
+                    status={nameInputStatus || status}
+                    placeholder="Give your bucket a name"
+                    name="name"
+                    autoFocus={true}
+                    value={name}
+                    onChange={onChangeInput}
+                  />
+                )}
+              </Form.ValidationElement>
               <Form.Element
                 label="Delete data older than"
                 errorMessage={this.ruleErrorMessage}
@@ -100,12 +104,24 @@ export default class BucketOverlayForm extends PureComponent<Props> {
     )
   }
 
+  private handleNameValidation = (name: string): string | null => {
+    if (isSystemBucket(name)) {
+      return 'Only system bucket names can begin with _'
+    }
+
+    if (!name) {
+      return 'This bucket needs a name'
+    }
+
+    return null
+  }
+
   private get nameHelpText(): string {
-    if (this.props.nameInputStatus !== ComponentStatus.Disabled) {
-      return ''
+    if (this.props.disableRenaming) {
+      return 'To rename the bucket use the RENAME button. Bucket renaming is not allowed here.'
     }
 
-    return 'To rename the bucket use the rename button. Bucket renaming is not allowed here.'
+    return ''
   }
 
   private get submitButtonColor(): ComponentColor {
@@ -120,10 +136,9 @@ export default class BucketOverlayForm extends PureComponent<Props> {
 
   private get submitButtonStatus(): ComponentStatus {
     const {name} = this.props
+    const nameHasErrors = this.handleNameValidation(name)
 
-    const nameEmpty = name === ''
-
-    if (nameEmpty || this.retentionIsTooShort) {
+    if (nameHasErrors || this.retentionIsTooShort) {
       return ComponentStatus.Disabled
     }
 
diff --git a/ui/src/buckets/components/CreateBucketOverlay.tsx b/ui/src/buckets/components/CreateBucketOverlay.tsx
index 1241a4c5e47..5198cb7be09 100644
--- a/ui/src/buckets/components/CreateBucketOverlay.tsx
+++ b/ui/src/buckets/components/CreateBucketOverlay.tsx
@@ -2,7 +2,7 @@
 import React, {PureComponent, ChangeEvent, FormEvent} from 'react'
 
 // Components
-import {Overlay, ComponentStatus} from '@influxdata/clockface'
+import {Overlay} from '@influxdata/clockface'
 import BucketOverlayForm from 'src/buckets/components/BucketOverlayForm'
 
 // Types
@@ -17,8 +17,6 @@ interface Props {
 interface State {
   bucket: Bucket
   ruleType: 'expire'
-  nameInputStatus: ComponentStatus
-  nameErrorMessage: string
 }
 
 const emptyBucket = {
@@ -30,16 +28,14 @@ export default class CreateBucketOverlay extends PureComponent<Props, State> {
   constructor(props) {
     super(props)
     this.state = {
-      nameErrorMessage: '',
       bucket: emptyBucket,
       ruleType: null,
-      nameInputStatus: ComponentStatus.Default,
     }
   }
 
   public render() {
     const {onCloseModal} = this.props
-    const {bucket, nameInputStatus, nameErrorMessage, ruleType} = this.state
+    const {bucket, ruleType} = this.state
 
     return (
       <Overlay.Container maxWidth={500}>
@@ -51,11 +47,10 @@ export default class CreateBucketOverlay extends PureComponent<Props, State> {
           <BucketOverlayForm
             name={bucket.name}
             buttonText="Create"
+            disableRenaming={false}
             ruleType={ruleType}
             onCloseModal={onCloseModal}
-            nameErrorMessage={nameErrorMessage}
             onSubmit={this.handleSubmit}
-            nameInputStatus={nameInputStatus}
             onChangeInput={this.handleChangeInput}
             retentionSeconds={this.retentionSeconds}
             onChangeRuleType={this.handleChangeRuleType}
@@ -113,18 +108,6 @@ export default class CreateBucketOverlay extends PureComponent<Props, State> {
     const key = e.target.name
     const bucket = {...this.state.bucket, [key]: value}
 
-    if (!value) {
-      return this.setState({
-        bucket,
-        nameInputStatus: ComponentStatus.Error,
-        nameErrorMessage: `Bucket ${key} cannot be empty`,
-      })
-    }
-
-    this.setState({
-      bucket,
-      nameInputStatus: ComponentStatus.Valid,
-      nameErrorMessage: '',
-    })
+    this.setState({bucket})
   }
 }
diff --git a/ui/src/buckets/components/UpdateBucketOverlay.tsx b/ui/src/buckets/components/UpdateBucketOverlay.tsx
index be58f75eda8..3b6c427e4c4 100644
--- a/ui/src/buckets/components/UpdateBucketOverlay.tsx
+++ b/ui/src/buckets/components/UpdateBucketOverlay.tsx
@@ -4,7 +4,7 @@ import {withRouter, WithRouterProps} from 'react-router'
 import {connect} from 'react-redux'
 
 // Components
-import {Overlay, ComponentStatus} from '@influxdata/clockface'
+import {Overlay} from '@influxdata/clockface'
 import BucketOverlayForm from 'src/buckets/components/BucketOverlayForm'
 
 // Actions
@@ -18,9 +18,7 @@ import {AppState, Bucket} from 'src/types'
 
 interface State {
   bucket: Bucket
-  nameErrorMessage: string
   ruleType: 'expire'
-  nameInputStatus: ComponentStatus
 }
 
 interface StateProps {
@@ -42,13 +40,11 @@ class UpdateBucketOverlay extends PureComponent<Props, State> {
     this.state = {
       ruleType: this.ruleType(bucket),
       bucket,
-      nameInputStatus: ComponentStatus.Default,
-      nameErrorMessage: '',
     }
   }
 
   public render() {
-    const {bucket, nameErrorMessage, ruleType} = this.state
+    const {bucket, ruleType} = this.state
 
     return (
       <Overlay visible={true}>
@@ -60,9 +56,8 @@ class UpdateBucketOverlay extends PureComponent<Props, State> {
               buttonText="Save Changes"
               ruleType={ruleType}
               onCloseModal={this.handleClose}
-              nameErrorMessage={nameErrorMessage}
               onSubmit={this.handleSubmit}
-              nameInputStatus={ComponentStatus.Disabled}
+              disableRenaming={true}
               onChangeInput={this.handleChangeInput}
               retentionSeconds={this.retentionSeconds}
               onChangeRuleType={this.handleChangeRuleType}
@@ -127,19 +122,7 @@ class UpdateBucketOverlay extends PureComponent<Props, State> {
     const key = e.target.name
     const bucket = {...this.state.bucket, [key]: value}
 
-    if (!value) {
-      return this.setState({
-        bucket,
-        nameInputStatus: ComponentStatus.Error,
-        nameErrorMessage: `Bucket ${key} cannot be empty`,
-      })
-    }
-
-    this.setState({
-      bucket,
-      nameInputStatus: ComponentStatus.Valid,
-      nameErrorMessage: '',
-    })
+    this.setState({bucket})
   }
 
   private handleClose = () => {
diff --git a/ui/src/buckets/constants/index.ts b/ui/src/buckets/constants/index.ts
index 85b64089b50..882e54c0288 100644
--- a/ui/src/buckets/constants/index.ts
+++ b/ui/src/buckets/constants/index.ts
@@ -1,8 +1,7 @@
-import {Bucket} from 'src/types'
 import {startsWith} from 'lodash'
 
 export const MIN_RETENTION_SECONDS = 3600
 
-export const isSystemBucket = (bucket: Bucket): boolean => {
-  return startsWith(bucket.name, '_')
+export const isSystemBucket = (bucketName: string): boolean => {
+  return startsWith(bucketName, '_')
 }

From f2f9bcfa4068308a4913829c2c2b26112a43fa7b Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 11:25:04 -0700
Subject: [PATCH 6/8] refactor(ui): remove system bucketes from generate token
 overlay

---
 .../components/BucketsTokenOverlay.tsx               | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/src/authorizations/components/BucketsTokenOverlay.tsx b/ui/src/authorizations/components/BucketsTokenOverlay.tsx
index 10ab1717827..39f32047344 100644
--- a/ui/src/authorizations/components/BucketsTokenOverlay.tsx
+++ b/ui/src/authorizations/components/BucketsTokenOverlay.tsx
@@ -28,6 +28,7 @@ import {
   allBucketsPermissions,
   BucketTab,
 } from 'src/authorizations/utils/permissions'
+import {isSystemBucket} from 'src/buckets/constants/index'
 
 // Actions
 import {createAuthorization} from 'src/authorizations/actions'
@@ -67,7 +68,6 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
   }
 
   render() {
-    const {buckets} = this.props
     const {
       description,
       readBuckets,
@@ -107,7 +107,7 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
                       >
                         <BucketsSelector
                           onSelect={this.handleSelectReadBucket}
-                          buckets={buckets}
+                          buckets={this.nonSystemBuckets}
                           selectedBuckets={readBuckets}
                           title="Read"
                           onSelectAll={this.handleReadSelectAllBuckets}
@@ -122,7 +122,7 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
                       >
                         <BucketsSelector
                           onSelect={this.handleSelectWriteBucket}
-                          buckets={buckets}
+                          buckets={this.nonSystemBuckets}
                           selectedBuckets={writeBuckets}
                           title="Write"
                           onSelectAll={this.handleWriteSelectAllBuckets}
@@ -264,6 +264,12 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
     return allBucketsPermissions(orgID, 'write')
   }
 
+  private get nonSystemBuckets(): Bucket[] {
+    const {buckets} = this.props
+
+    return buckets.filter(bucket => !isSystemBucket(bucket.name))
+  }
+
   private handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
     const {value} = e.target
 

From 4beeaff43fab055e87db2e14909cefa8846a22da Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 11:32:23 -0700
Subject: [PATCH 7/8] refactor(ui): remove system buckets from bucket dropdowns

---
 .../components/BucketsDropdown.tsx            | 11 +++++-
 .../components/TasksOptionsBucketDropdown.tsx | 37 +++++++++++--------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/ui/src/dataLoaders/components/BucketsDropdown.tsx b/ui/src/dataLoaders/components/BucketsDropdown.tsx
index 4fea5d4294b..5f1d3262d90 100644
--- a/ui/src/dataLoaders/components/BucketsDropdown.tsx
+++ b/ui/src/dataLoaders/components/BucketsDropdown.tsx
@@ -4,6 +4,9 @@ import React, {PureComponent} from 'react'
 // Components
 import {Dropdown, ComponentStatus} from '@influxdata/clockface'
 
+// Utils
+import {isSystemBucket} from 'src/buckets/constants/index'
+
 // Types
 import {Bucket} from 'src/types'
 
@@ -67,7 +70,13 @@ class BucketsDropdown extends PureComponent<Props> {
       return []
     }
 
-    return buckets.map(b => (
+    const nonSystemBuckets = buckets.filter(bucket => {
+      if (!isSystemBucket(bucket.name)) {
+        return bucket
+      }
+    })
+
+    return nonSystemBuckets.map(b => (
       <Dropdown.Item
         key={b.name}
         value={b}
diff --git a/ui/src/tasks/components/TasksOptionsBucketDropdown.tsx b/ui/src/tasks/components/TasksOptionsBucketDropdown.tsx
index a542272aae8..52826cd31cd 100644
--- a/ui/src/tasks/components/TasksOptionsBucketDropdown.tsx
+++ b/ui/src/tasks/components/TasksOptionsBucketDropdown.tsx
@@ -6,6 +6,9 @@ import {connect} from 'react-redux'
 // Components
 import {Dropdown, ComponentStatus} from '@influxdata/clockface'
 
+// Utils
+import {isSystemBucket} from 'src/buckets/constants/index'
+
 // Types
 import {RemoteDataState, AppState, Bucket} from 'src/types'
 
@@ -58,27 +61,31 @@ class TaskOptionsBucketDropdown extends PureComponent<Props> {
   private get dropdownItems(): JSX.Element[] {
     const {buckets} = this.props
 
-    if (buckets && buckets.length) {
-      return buckets.map(bucket => {
-        return (
-          <Dropdown.Item
-            id={bucket.name}
-            key={bucket.name}
-            value={bucket.name}
-            onClick={this.props.onChangeBucketName}
-            selected={bucket.id === this.selectedName}
-          >
-            {bucket.name}
-          </Dropdown.Item>
-        )
-      })
-    } else {
+    if (!buckets || !buckets.length) {
       return [
         <Dropdown.Item id="no-buckets" key="no-buckets" value="no-buckets">
           No Buckets found in Org
         </Dropdown.Item>,
       ]
     }
+
+    const nonSystemBuckets = buckets.filter(
+      bucket => !isSystemBucket(bucket.name)
+    )
+
+    return nonSystemBuckets.map(bucket => {
+      return (
+        <Dropdown.Item
+          id={bucket.name}
+          key={bucket.name}
+          value={bucket.name}
+          onClick={this.props.onChangeBucketName}
+          selected={bucket.id === this.selectedName}
+        >
+          {bucket.name}
+        </Dropdown.Item>
+      )
+    })
   }
 
   private get status(): ComponentStatus {

From f162cc59667d68a3246c37d404908988cffff3d9 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Mon, 9 Sep 2019 12:55:20 -0700
Subject: [PATCH 8/8] chore(ui): update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce2c4ac0224..5ae8a0a4a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ### Features
 
 ### UI Improvements
+1. [15056](https://github.com/influxdata/influxdb/pull/15056): Remove rename and delete functionality from system buckets
+1. [15056](https://github.com/influxdata/influxdb/pull/15056): Prevent new buckets from being named with the reserved "_" prefix
+1. [15056](https://github.com/influxdata/influxdb/pull/15056): Prevent user from selecting system buckets when creating Scrapers, Telegraf configurations, read/write tokens, and when saving as a task
+1. [15056](https://github.com/influxdata/influxdb/pull/15056): Limit values from draggable threshold handles to 2 decimal places
 1. [15040](https://github.com/influxdata/influxdb/pull/15040): Redesign check builder UI to fill the screen and make more room for composing message templates
 1. [14990](https://github.com/influxdata/influxdb/pull/14990): Move Tokens tab from Settings to Load Data page
 1. [14990](https://github.com/influxdata/influxdb/pull/14990): Expose all Settings tabs in navigation menu