fix: disable tag buttons during updates, don't clear tag search facet…

… when removing active tags
sanity-io · Feb 10, 2021 · 139ba16 · 139ba16
1 parent 625104a
commit 139ba16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/src/components/Tag/index.tsx b/src/components/Tag/index.tsx
@@ -78,7 +78,10 @@ const Tag: FC<Props> = (props: Props) => {
         <Text
           muted={!isSearchFacetTag}
           size={1}
-          style={{userSelect: 'none'}}
+          style={{
+            opacity: tag?.updating ? 0.25 : 1,
+            userSelect: 'none'
+          }}
           textOverflow="ellipsis"
           weight={isSearchFacetTag ? 'bold' : 'regular'}
         >
@@ -89,6 +92,7 @@ const Tag: FC<Props> = (props: Props) => {
       <ButtonContainer align="center" paddingRight={1} style={{flexShrink: 0}}>
         {/* Edit icon */}
         <Button
+          disabled={tag?.updating}
           fontSize={1}
           icon={EditIcon}
           mode="bleed"
@@ -102,6 +106,7 @@ const Tag: FC<Props> = (props: Props) => {
         />
         {/* Delete icon */}
         <Button
+          disabled={tag?.updating}
           fontSize={1}
           icon={TrashIcon}
           mode="bleed"

diff --git a/src/modules/index.ts b/src/modules/index.ts
@@ -25,7 +25,7 @@ import notifications, {
   notificationsTagCreateCompleteEpic,
   notificationsTagDeleteCompleteEpic
 } from './notifications'
-import search, {searchFacetTagRemoveEpic, searchFacetTagUpdateEpic} from './search'
+import search, {searchFacetTagUpdateEpic} from './search'
 import tags, {
   tagsCreateEpic,
   tagsDeleteEpic,
@@ -53,7 +53,6 @@ export const rootEpic = combineEpics(
   notificationsAssetUpdateCompleteEpic,
   notificationsTagCreateCompleteEpic,
   notificationsTagDeleteCompleteEpic,
-  searchFacetTagRemoveEpic,
   searchFacetTagUpdateEpic,
   tagsCreateEpic,
   tagsDeleteEpic,

diff --git a/src/modules/search/index.ts b/src/modules/search/index.ts
@@ -192,30 +192,6 @@ export const searchQuerySet = (searchQuery: string): SearchQuerySetAction => ({
  * EPICS *
  *********/
 
-/**
- * Listen for tag delete completions:
- * - clear tag search facet (if present and set to the recently deleted tag)
- */
-export const searchFacetTagRemoveEpic = (
-  action$: Observable<TagsActions>,
-  state$: StateObservable<RootReducerState>
-): Observable<SearchActions> =>
-  action$.pipe(
-    filter(isOfType(TagsActionTypes.DELETE_COMPLETE)),
-    withLatestFrom(state$),
-    mergeMap(([action, state]) => {
-      const currentSearchFacetTag = state.search.facets?.find(facet => facet.name === 'tag')
-
-      if (currentSearchFacetTag?.type === 'searchable') {
-        if (currentSearchFacetTag.value?.value === action?.payload?.tagId) {
-          return of(searchFacetsRemove('tag'))
-        }
-      }
-
-      return empty()
-    })
-  )
-
 /**
  * Listen for tag update completions:
  * - update tag search facet (if present and set to the recently deleted tag)