diff --git a/NEWS b/NEWS index a9eeaa939..69362e101 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +v0.5.18 +* Fix filters not changing display bug + v0.5.17 * Fix root_path not parsing bug diff --git a/docker-env b/docker-env index 7c88e8bd0..c1c6faa47 100644 --- a/docker-env +++ b/docker-env @@ -2,6 +2,6 @@ REPO=ajslater/codex IMAGE=ajslater/codex INSTALL_BASE_VERSION=python3.8.5-alpine3.12_0.1.0-3fb89fc RUNNABLE_BASE_VERSION=python3.8.5-alpine3.12_0.2.0-a88d3d9_0.1.0-3328e8e -PKG_VERSION=0.5.17 +PKG_VERSION=0.5.18 PUID=501 PGID=20 diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c1c42386b..0601a66a1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,6 +1,6 @@ { "name": "codex", - "version": "0.5.17", + "version": "0.5.18", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/frontend/package.json b/frontend/package.json index c24843703..c2ce0760b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "codex", - "version": "0.5.17", + "version": "0.5.18", "private": true, "description": "ui for codex api", "scripts": { diff --git a/frontend/src/api/v1/browser.js b/frontend/src/api/v1/browser.js index 8b165ec0c..3429f4b13 100644 --- a/frontend/src/api/v1/browser.js +++ b/frontend/src/api/v1/browser.js @@ -9,16 +9,16 @@ const debug = process.env.NODE_ENV !== "production"; // REST ENDPOINTS -const getBrowseOpened = ({ group, pk, page }) => { +const getBrowserOpened = ({ group, pk, page }) => { return ajax("get", `${BROWSE_BASE}/${group}/${pk}/${page}`); }; -const getBrowseObjects = ({ route, settings }) => { +const getBrowserPage = ({ route, settings }) => { const { group, pk, page } = route; return ajax("put", `${BROWSE_BASE}/${group}/${pk}/${page}`, settings); }; -const getBrowseChoices = ({ group, pk, choice_type }) => { +const getBrowserChoices = ({ group, pk, choice_type }) => { return ajax("get", `${BROWSE_BASE}/${group}/${pk}/choices/${choice_type}`); }; @@ -77,9 +77,9 @@ export const getSocket = (isAdmin) => { }; export default { - getBrowseOpened, - getBrowseObjects, - getBrowseChoices, + getBrowserOpened, + getBrowserPage, + getBrowserChoices, getScanInProgress, setMarkRead, getSocket, diff --git a/frontend/src/components/browser-main.vue b/frontend/src/components/browser-main.vue index e6d90bd96..130144fb5 100644 --- a/frontend/src/components/browser-main.vue +++ b/frontend/src/components/browser-main.vue @@ -73,7 +73,7 @@ export default { showPlaceHolder: function (state) { return ( this.enableNonUsers === undefined || - (!state.browsePageLoaded && this.isOpenToSee) + (!state.browserPageLoaded && this.isOpenToSee) ); }, }), diff --git a/frontend/src/store/modules/browser.js b/frontend/src/store/modules/browser.js index 08864addb..5805337b0 100644 --- a/frontend/src/store/modules/browser.js +++ b/frontend/src/store/modules/browser.js @@ -61,7 +61,7 @@ const state = { }, objList: [], filterMode: "base", - browsePageLoaded: false, + browserPageLoaded: false, librariesExist: null, scanNotify: false, numPages: 1, @@ -97,7 +97,7 @@ const getters = { const mutations = { setBrowsePageLoaded(state, value) { - state.browsePageLoaded = value; + state.browserPageLoaded = value; }, setBrowserRoute(state, route) { state.routes.current = route; @@ -290,7 +290,7 @@ const scanNotifyCheck = (commit, state) => { }) .catch((error) => { console.error(error); - console.log("scanNotifyCheck() Response", error.response); + console.warn("scanNotifyCheck() Response", error.response); }); }, wait); }; @@ -300,7 +300,7 @@ const actions = { // Gets everything needed to open the component. commit("setBrowsePageLoaded", false); commit("setBrowserRoute", route); - await API.getBrowseOpened(route) + await API.getBrowserOpened(route) .then((response) => { const data = response.data; commit("setVersions", data.versions); @@ -319,13 +319,13 @@ const actions = { error.response.data.group ) { const data = error.response.data; - console.log(data.message); - console.log("Valid group is", data.group); + console.warn(data.message); + console.warn("Valid group is", data.group); const route = topGroupRoute(data.group); dispatch("browserOpened", route.params); } else { console.error(error); - console.log("browserOpened response:", error.response); + console.warn("browserOpened response:", error.response); } return handleBrowseError({ state, commit }, error); }); @@ -337,6 +337,7 @@ const actions = { isNeedValidate(changedData) && !validateState({ state, commit, dispatch }) ) { + console.warning("NOT VALIDATED"); return; } dispatch("getBrowserPage"); @@ -352,7 +353,7 @@ const actions = { }, async getBrowserPage({ commit, dispatch, state }) { // Get objects for the current route and setttings. - if (!state.browseLoaded) { + if (!state.browserPageLoaded) { return dispatch("browserOpened", state.routes.current); } await API.getBrowserPage({ @@ -372,7 +373,7 @@ const actions = { }, async setFilterMode({ commit, state }, { group, pk, mode }) { if (mode && mode !== "base" && state.formChoices[mode] == null) { - await API.getBrowseChoices({ group, pk, choice_type: mode }) + await API.getBrowserChoices({ group, pk, choice_type: mode }) .then((response) => { response.data.key = mode; return commit("setBrowseChoice", response.data); diff --git a/pyproject.toml b/pyproject.toml index 0ca0a12f9..83010a1c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = ["poetry.masonry.api"] [tool.poetry] name = "codex" -version = "0.5.17" +version = "0.5.18" description = "A comic archive web server." license = "GPL-2.0-only" authors = ["AJ Slater "]