Refactored website ordering feature.

components/settings/WebsiteSettings.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import Link from 'components/common/Link';
@@ -24,12 +24,8 @@ import Code from 'assets/code.svg';
 import LinkIcon from 'assets/link.svg';
 import useFetch from 'hooks/useFetch';
 import useUser from 'hooks/useUser';
-import { orderByWebsiteMap } from 'lib/format';
-import useStore from 'store/app';
 import styles from './WebsiteSettings.module.css';
 
-const selector = state => state.dashboard;
-
 export default function WebsiteSettings() {
   const { user } = useUser();
   const [editWebsite, setEditWebsite] = useState();
@@ -41,13 +37,8 @@ export default function WebsiteSettings() {
   const [saved, setSaved] = useState(0);
   const [message, setMessage] = useState();
 
-  const store = useStore(selector);
-  const { websiteOrdering } = store;
-
   const { data } = useFetch('/websites', { params: { include_all: !!user?.is_admin } }, [saved]);
 
-  const ordered = useMemo(() => orderByWebsiteMap(data, websiteOrdering), [data, websiteOrdering]);
-
   const Buttons = row => (
     <ButtonLayout align="right">
       {row.share_id && (
@@ -196,7 +187,7 @@ export default function WebsiteSettings() {
           <FormattedMessage id="label.add-website" defaultMessage="Add website" />
         </Button>
       </PageHeader>
-      <Table columns={user.is_admin ? adminColumns : columns} rows={ordered} empty={empty} />
+      <Table columns={user.is_admin ? adminColumns : columns} rows={data} empty={empty} />
       {editWebsite && (
         <Modal title={<FormattedMessage id="label.edit-website" defaultMessage="Edit website" />}>
           <WebsiteEditForm values={editWebsite} onSave={handleSave} onClose={handleClose} />