Skip to content

Commit

Permalink
Merge branch 'fix-location-filter' of dennis531/opencast-admin-interf…
Browse files Browse the repository at this point in the history
…ace into main

Pull request #580
Closes #517
  Remove race condition in table filters
  • Loading branch information
gregorydlogan committed Jun 4, 2024
2 parents c5f76c1 + 35a8368 commit 8fcf44e
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/components/configuration/Themes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const Themes = ({
const themes = useAppSelector(state => getTotalThemes(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchThemesWrapper = () => {
dispatch(fetchThemes())
const fetchThemesWrapper = async () => {
await dispatch(fetchThemes())
}

const loadThemes = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/events/Events.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ const Events = ({
let location = useLocation();

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchEventsWrapper = () => {
dispatch(fetchEvents())
const fetchEventsWrapper = async () => {
await dispatch(fetchEvents())
}

const loadEvents = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/events/Series.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ const Series = ({
const showActions = useAppSelector(state => isShowActions(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchSeriesWrapper = () => {
dispatch(fetchSeries())
const fetchSeriesWrapper = async () => {
await dispatch(fetchSeries())
}

const loadEvents = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/recordings/Recordings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ const Recordings = ({
const recordings = useAppSelector(state => getTotalRecordings(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchRecordingsWrapper = () => {
dispatch(fetchRecordings(undefined))
const fetchRecordingsWrapper = async () => {
await dispatch(fetchRecordings(undefined))
}

const loadRecordings = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/systems/Jobs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const Jobs = ({
const jobs = useAppSelector(state => getTotalJobs(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchJobsWrapper = () => {
dispatch(fetchJobs())
const fetchJobsWrapper = async () => {
await dispatch(fetchJobs())
}

const loadJobs = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/systems/Servers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const Servers = ({
const servers = useAppSelector(state => getTotalServers(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchServersWrapper = () => {
dispatch(fetchServers())
const fetchServersWrapper = async () => {
await dispatch(fetchServers())
}

const loadServers = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/systems/Services.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const Services = ({
const services = useAppSelector(state => getTotalServices(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchServicesWrapper = () => {
dispatch(fetchServices())
const fetchServicesWrapper = async () => {
await dispatch(fetchServices())
}

const loadServices = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/users/Groups.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ const Groups = ({
const currentFilterType = useAppSelector(state => getCurrentFilterResource(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchGroupsWrapper = () => {
dispatch(fetchGroups())
const fetchGroupsWrapper = async () => {
await dispatch(fetchGroups())
}

const loadGroups = async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/users/Users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ const Users: React.FC = () => {
const currentFilterType = useAppSelector(state => getCurrentFilterResource(state));

// TODO: Get rid of the wrappers when modernizing redux is done
const fetchUsersWrapper = () => {
dispatch(fetchUsers())
const fetchUsersWrapper = async () => {
await dispatch(fetchUsers())
}

const loadUsers = async () => {
Expand Down

0 comments on commit 8fcf44e

Please sign in to comment.