Merge remote-tracking branch 'origin/dev' into dev

components/metrics/PagesTable.js

@@ -1,38 +1,16 @@
-import { useState } from 'react';
 import FilterLink from 'components/common/FilterLink';
-import FilterButtons from 'components/common/FilterButtons';
-import { urlFilter } from 'lib/filters';
 import MetricsTable from './MetricsTable';
-import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
 import useMessages from 'hooks/useMessages';
 
-const filters = {
-  [FILTER_RAW]: null,
-  [FILTER_COMBINED]: urlFilter,
-};
-
-export default function PagesTable({ websiteId, showFilters, ...props }) {
-  const [filter, setFilter] = useState(FILTER_COMBINED);
+export default function PagesTable({ websiteId, ...props }) {
   const { formatMessage, labels } = useMessages();
 
-  const buttons = [
-    {
-      label: formatMessage(labels.filterCombined),
-      key: FILTER_COMBINED,
-    },
-    {
-      label: formatMessage(labels.filterRaw),
-      key: FILTER_RAW,
-    },
-  ];
-
   const renderLink = ({ x: url }) => {
     return <FilterLink id="url" value={url} />;
   };
 
   return (
     <>
-      {showFilters && <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />}
       <MetricsTable
         title={formatMessage(labels.pages)}
         type="url"

components/metrics/WebsiteChart.module.css

@@ -24,12 +24,12 @@
   min-height: 90px;
   margin-bottom: 20px;
   background: var(--base50);
+  z-index: var(--z-index300);
 }
 
 .sticky {
   position: sticky;
   top: -1px;
-  z-index: 2;
 }
 
 .isSticky {

components/pages/settings/websites/WebsiteSettings.js

@@ -10,23 +10,21 @@ import TrackingCode from 'components/pages/settings/websites/TrackingCode';
 import ShareUrl from 'components/pages/settings/websites/ShareUrl';
 import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
+import useConfig from 'hooks/useConfig';
 
 export default function WebsiteSettings({ websiteId }) {
   const router = useRouter();
   const { formatMessage, labels, messages } = useMessages();
-  const [values, setValues] = useState(null);
-  const [tab, setTab] = useState('details');
+  const { openExternal } = useConfig();
   const { get, useQuery } = useApi();
   const { toast, showToast } = useToast();
   const { data, isLoading } = useQuery(
     ['website', websiteId],
-    () => {
-      if (websiteId) {
-        return get(`/websites/${websiteId}`);
-      }
-    },
-    { cacheTime: 0 },
+    () => get(`/websites/${websiteId}`),
+    { enabled: !!websiteId, cacheTime: 0 },
   );
+  const [values, setValues] = useState(null);
+  const [tab, setTab] = useState('details');
 
   const handleSave = data => {
     showToast({ message: formatMessage(messages.saved), variant: 'success' });
@@ -58,7 +56,7 @@ export default function WebsiteSettings({ websiteId }) {
           </Breadcrumbs>
         }
       >
-        <Link href={`/analytics/websites/${websiteId}`} target="_blank">
+        <Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}>
           <Button variant="primary">
             <Icon>
               <Icons.External />

components/pages/settings/websites/WebsitesTable.js

@@ -13,9 +13,11 @@ import {
   Flexbox,
 } from 'react-basics';
 import useMessages from 'hooks/useMessages';
+import useConfig from 'hooks/useConfig';
 
 export default function WebsitesTable({ data = [] }) {
   const { formatMessage, labels } = useMessages();
+  const { openExternal } = useConfig();
 
   const columns = [
     { name: 'name', label: formatMessage(labels.name), style: { flex: 2 } },
@@ -48,7 +50,7 @@ export default function WebsitesTable({ data = [] }) {
                   <Text>{formatMessage(labels.edit)}</Text>
                 </Button>
               </Link>
-              <Link href={`/websites/${id}`}>
+              <Link href={`/websites/${id}`} target={openExternal ? '_blank' : null}>
                 <Button>
                   <Icon>
                     <Icons.External />