Merge pull request #2815 from target/feat/slack-dm-ui

slack: add UI for Slack DM contact method type (experimental)
target · Feb 23, 2023 · 4cbad91 · 4cbad91
2 parents 1dcdf4c + df8ca07
commit 4cbad91
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 8 deletions.
diff --git a/notification/slack/cache.go b/notification/slack/cache.go
@@ -1,6 +1,7 @@
 package slack
 
 import (
+	"sync"
 	"time"
 
 	"github.com/golang/groupcache/lru"
@@ -9,6 +10,12 @@ import (
 type ttlCache[K comparable, V any] struct {
 	*lru.Cache
 	ttl time.Duration
+
+	// We use a mutex to protect the cache from concurrent access
+	// as this is not handled by the lru package.
+	//
+	// See https://github.com/golang/groupcache/issues/87#issuecomment-338494548
+	mx sync.Mutex
 }
 
 func newTTLCache[K comparable, V any](maxEntries int, ttl time.Duration) *ttlCache[K, V] {
@@ -24,13 +31,19 @@ type cacheItem[V any] struct {
 }
 
 func (c *ttlCache[K, V]) Add(key lru.Key, value V) {
+	c.mx.Lock()
+	defer c.mx.Unlock()
+
 	c.Cache.Add(key, cacheItem[V]{
 		value:   value,
 		expires: time.Now().Add(c.ttl),
 	})
 }
 
 func (c *ttlCache[K, V]) Get(key K) (val V, ok bool) {
+	c.mx.Lock()
+	defer c.mx.Unlock()
+
 	item, ok := c.Cache.Get(key)
 	if !ok {
 		return val, false

diff --git a/web/src/app/users/UserContactMethodCreateDialog.tsx b/web/src/app/users/UserContactMethodCreateDialog.tsx
@@ -8,6 +8,7 @@ import { useConfigValue } from '../util/RequireConfig'
 import { Dialog, DialogTitle, DialogActions, Button } from '@mui/material'
 import DialogContentError from '../dialogs/components/DialogContentError'
 import { ContactMethodType } from '../../schema'
+import { useExpFlag } from '../util/useExpFlag'
 
 type Value = {
   name: string
@@ -40,19 +41,25 @@ export default function UserContactMethodCreateDialog(props: {
   title?: string
   subtitle?: string
 }): JSX.Element {
-  const [allowSV, allowE, allowW] = useConfigValue(
+  const [allowSV, allowE, allowW, allowS] = useConfigValue(
     'Twilio.Enable',
     'SMTP.Enable',
     'Webhook.Enable',
+    'Slack.Enable',
   )
+  const allowSFlag = useExpFlag('slack-dm')
+
   let typeVal: ContactMethodType = 'VOICE'
   if (allowSV) {
     typeVal = 'SMS'
   } else if (allowE) {
     typeVal = 'EMAIL'
   } else if (allowW) {
     typeVal = 'WEBHOOK'
+  } else if (allowS && allowSFlag) {
+    typeVal = 'SLACK_DM'
   }
+
   // values for contact method form
   const [CMValue, setCMValue] = useState<Value>({
     name: '',

diff --git a/web/src/app/users/UserContactMethodForm.tsx b/web/src/app/users/UserContactMethodForm.tsx
@@ -7,6 +7,7 @@ import { MenuItem, Typography } from '@mui/material'
 import { ContactMethodType } from '../../schema'
 import { useConfigValue } from '../util/RequireConfig'
 import { FieldError } from '../util/errutil'
+import { useExpFlag } from '../util/useExpFlag'
 
 type Value = {
   name: string
@@ -72,6 +73,22 @@ function renderURLField(edit: boolean): JSX.Element {
   )
 }
 
+function renderSlackField(edit: boolean): JSX.Element {
+  return (
+    <FormField
+      fullWidth
+      name='value'
+      required
+      label='Slack Member ID'
+      placeholder='member ID'
+      component={TextField}
+      disabled={edit}
+      // @ts-expect-error TS2322 -- FormField has not been converted to ts, and inferred type is incorrect.
+      helperText='Go to your Slack profile, click the three dots, and select "Copy member ID".'
+    />
+  )
+}
+
 function renderTypeField(type: ContactMethodType, edit: boolean): JSX.Element {
   switch (type) {
     case 'SMS':
@@ -81,6 +98,8 @@ function renderTypeField(type: ContactMethodType, edit: boolean): JSX.Element {
       return renderEmailField(edit)
     case 'WEBHOOK':
       return renderURLField(edit)
+    case 'SLACK_DM':
+      return renderSlackField(edit)
     default:
   }
 
@@ -105,13 +124,21 @@ export default function UserContactMethodForm(
 ): JSX.Element {
   const { value, edit = false, ...other } = props
 
-  const [smsVoiceEnabled, emailEnabled, webhookEnabled, disclaimer] =
-    useConfigValue(
-      'Twilio.Enable',
-      'SMTP.Enable',
-      'Webhook.Enable',
-      'General.NotificationDisclaimer',
-    )
+  const [
+    smsVoiceEnabled,
+    emailEnabled,
+    webhookEnabled,
+    slackEnabled,
+    disclaimer,
+  ] = useConfigValue(
+    'Twilio.Enable',
+    'SMTP.Enable',
+    'Webhook.Enable',
+    'Slack.Enable',
+    'General.NotificationDisclaimer',
+  )
+
+  const slackDMEnabled = useExpFlag('slack-dm')
 
   return (
     <FormContainer
@@ -154,6 +181,9 @@ export default function UserContactMethodForm(
             {(edit || webhookEnabled) && (
               <MenuItem value='WEBHOOK'>WEBHOOK</MenuItem>
             )}
+            {(edit || (slackEnabled && slackDMEnabled)) && (
+              <MenuItem value='SLACK_DM'>SLACK DM</MenuItem>
+            )}
           </FormField>
         </Grid>
         <Grid item xs={12}>

diff --git a/web/src/app/users/UserContactMethodList.tsx b/web/src/app/users/UserContactMethodList.tsx
@@ -19,6 +19,7 @@ import AppLink from '../util/AppLink'
 import { styles as globalStyles } from '../styles/materialStyles'
 import { UserContactMethod } from '../../schema'
 import UserContactMethodCreateDialog from './UserContactMethodCreateDialog'
+import { useExpFlag } from '../util/useExpFlag'
 
 const query = gql`
   query cmList($id: ID!) {
@@ -61,6 +62,7 @@ export default function UserContactMethodList(
   const [showEditDialogByID, setShowEditDialogByID] = useState('')
   const [showDeleteDialogByID, setShowDeleteDialogByID] = useState('')
   const [showSendTestByID, setShowSendTestByID] = useState('')
+  const hasSlackDM = useExpFlag('slack-dm')
 
   const { loading, error, data } = useQuery(query, {
     variables: {
@@ -102,6 +104,9 @@ export default function UserContactMethodList(
       },
     ]
 
+    // don't show send test for slack DMs if disabled
+    if (cm.type === 'SLACK_DM' && !hasSlackDM) return actions
+
     if (!cm.disabled) {
       actions.push({
         label: 'Send Test',