Linting is hard?

glitch-soc · Mar 12, 2024 · c08dfb1 · c08dfb1
1 parent 83c6600
commit c08dfb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/app/controllers/api/v1/lists/tags_controller.rb b/app/controllers/api/v1/lists/tags_controller.rb
@@ -50,7 +50,7 @@ def list_tags
     ids.push(*existing_by_name.map { |t| t.id })
     not_existing_by_name = names.reject { |n| existing_by_name.any? { |e| e.name == Tag.normalize(n) }}
     created = Tag.find_or_create_by_names(not_existing_by_name)
-    ids.push(*created.map(&:id)
+    ids.push(*created.map(&:id))
     Tag.find(ids)
   end
 

diff --git a/app/javascript/flavours/glitch/features/list_editor/index.jsx b/app/javascript/flavours/glitch/features/list_editor/index.jsx
@@ -37,10 +37,8 @@ const mapDispatchToProps = dispatch => ({
 class ListEditor extends ImmutablePureComponent {
   state = {
     currentTab: 'accounts',
-  };
-
+  }
   static propTypes = {
-    intl: PropTypes.object.isRequired,
     listId: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -62,27 +60,15 @@ class ListEditor extends ImmutablePureComponent {
     onReset();
   }
 
-  switchToAccounts() {
-    this.switchToTab('accounts');
-  }
-
-  switchToTags() {
-    this.switchToTab('tags');
-  }
-
-  switchToTab(tab) {
-    this.setState({ ...this.state, currentTab: tab });
-  }
-
   render() {
     const { accountIds, tags, searchAccountIds, onClear, intl } = this.props;
     const showSearch = searchAccountIds.size > 0;
     return (
-      <div className='modal-root__modal list-editor'>
+      <div className='modal-root__modal list-editor'>{this.state.currentTab}
         <EditListForm />
         <div className='tab__container'>
-          <div onClick={this.switchToAccounts} className={'tab ' + ('accounts' === this.state.currentTab ? 'tab__active' : '')}>{intl.formatMessage(messages.account_tab)} ({accountIds.size})</div>
-          <div onClick={this.switchToTags} className={'tab ' + ('tags' === this.state.currentTab ? 'tab__active' : '')}>{intl.formatMessage(messages.tag_tab)} ({tags.size})</div>
+          <button onClick={() => this.setState({ currentTab: 'accounts' })} className={'tab ' + ('accounts' === this.state.currentTab ? 'tab__active' : '')}>{intl.formatMessage(messages.account_tab)} ({accountIds.size})</button>
+          <button onClick={() => this.setState({ currentTab: 'tags' })} className={'tab ' + ('tags' === this.state.currentTab ? 'tab__active' : '')}>{intl.formatMessage(messages.tag_tab)} ({tags.size})</button>
         </div>
         <div id='list_editor_accounts' className={'accounts' === this.state.currentTab ? 'tab__active' : 'tab__inactive'}>
           <Search />

diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
@@ -161,4 +161,4 @@
   "status.local_only": "Only visible from your instance",
   "status.uncollapse": "Uncollapse",
   "suggestions.dismiss": "Dismiss suggestion"
-}
+}