Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 21 additions & 27 deletions next/components/molecules/TableColumns.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,17 @@ import SearchIcon from '../../public/img/icons/searchIcon';
import RedirectIcon from '../../public/img/icons/redirectIcon';
import 'katex/dist/katex.min.css';

const SearchColumn = memo(({ isLoaded, resource, columns }) => {
function SearchColumn({ isLoaded, resource, columns }) {
const { t } = useTranslation('dataset');
const [inputFocus, setInputFocus] = useState(false);
const [search, setSearch] = useState("");
const [value, setValue] = useState("");
const [_timeout, _setTimeout] = useState(null);

const searcherColumn = useMemo(() =>
new FuzzySearch(resource, ["node.name", "node.description"], {sort: true}),
[resource]
);
function getSearcherColumn() {
return new FuzzySearch(resource, ["node.name", "node.description"], {sort: true});
}

const handleSearch = useCallback((searchValue) => {
function handleSearch(searchValue) {
clearTimeout(_timeout);
isLoaded(true);

Expand All @@ -52,23 +50,19 @@ const SearchColumn = memo(({ isLoaded, resource, columns }) => {
}

_setTimeout(setTimeout(() => {
const result = searcherColumn.search(searchValue.trim());
const result = getSearcherColumn().search(searchValue.trim());
if(result.length > 0) {
columns(result);
} else {
columns(resource);
}
isLoaded(false);
}, 500));
}, [_timeout, isLoaded, columns, resource, searcherColumn]);

useEffect(() => {
handleSearch(value);
}, [value, handleSearch]);
}

useEffect(() => {
setValue(search);
}, [search]);
handleSearch(search);
}, [search, resource]);

return (
<ControlledInputSimple
Expand All @@ -90,7 +84,7 @@ const SearchColumn = memo(({ isLoaded, resource, columns }) => {
}
/>
);
});
}

const TableHeader = memo(({ header, ...props }) => {
const { t } = useTranslation('dataset');
Expand Down Expand Up @@ -190,6 +184,12 @@ const TableValue = memo(({children, ...props}) => {
);
});

function sortElements(a, b) {
if (a.node.order < b.node.order) return -1;
if (a.node.order > b.node.order) return 1;
return 0;
}

export default function TableColumns({
tableId,
checkedColumns,
Expand All @@ -201,8 +201,8 @@ export default function TableColumns({
}) {
const router = useRouter();
const { query, locale } = router;
const [resource, setResource] = useState({});
const [columns, setColumns] = useState({});
const [resource, setResource] = useState([]);
const [columns, setColumns] = useState([]);
const [isError, setIsError] = useState(false);
const [isLoading, setIsLoading] = useState(true);
const [isSearchLoading, setIsSearchLoading] = useState(true);
Expand Down Expand Up @@ -287,7 +287,7 @@ export default function TableColumns({
}
], [t, template]);

const fetchColumns = useCallback(async () => {
const fetchColumns = async () => {
if(tableId === undefined) return;

setHasLoading(true);
Expand Down Expand Up @@ -316,22 +316,16 @@ export default function TableColumns({
} finally {
setIsLoading(false);
}
}, [tableId, locale, setHasLoading, numberColumns]);
};

useEffect(() => {
fetchColumns();
}, [fetchColumns]);
}, [tableId, locale]);

useEffect(() => {
setIsLoading(hasLoading);
}, [hasLoading]);

const sortElements = useCallback((a, b) => {
if (a.node.order < b.node.order) return -1;
if (a.node.order > b.node.order) return 1;
return 0;
}, []);

function HasDownloadPermitted(value) {
let downloadPermitted = false
let downloadWarning = ""
Expand Down