Vue Migration - fixes #80 by berdosi · Pull Request #92 · nextcloud/weather

berdosi · 2020-10-21T16:09:50Z

This is quite a mouthful, for a full rewrite of the frontend template (API calls were kept pretty much as-is)

Uses @nextcloud/vue components, giving an uniform feel
Responsive behavior is reworked (there is no playing around with font sizes, just columns being hidden / shown)
CSS uses classes instead of IDs.
Home city is set from the city list.

It builds with npm install && npm build.
The bundle is around 1MB, which seems large - but comparable to all the other Nextcloud applications.

Also, I've added a blur to the content panels, which could work around #90 (only works on WebKit):

e-alfred · 2020-11-01T01:10:15Z

This looks very nice, thanks for your hard work! Do you think it is ready to be merged already?

nerzhul · 2020-11-03T15:30:34Z

i like the new additions you did too, didn't reviewed the code

berdosi · 2020-11-08T23:32:31Z

Thank you !
I just kept fixing issues since the fcda994 commit, and there were no new ones on my end.

What I didn't pay much attention to is what happens when adding / removing cities, and some of the current behavior may be considered a regression:
We might be (adding / removing) a city which (is / is not) the home city and (is / is not) currently selected, and as a result there are (0 / 1 / more) cities. How should this effect the selected / home city?

e-alfred · 2020-11-09T08:48:35Z

This looks quite awesome! Do you think we should wait and include it in a possible release for Nextcloud 20 or make a release for Nextcloud 20 anyway with the legacy Angular.js interface?

berdosi · 2020-11-09T13:20:47Z

This PR doesn't depend on Nextcloud 20 APIs – it may be released whenever it's considered ready.

Nextcloud 20 may warrant a rewrite on the backend, though: it comes with its built-in Dashboard including weather data from met.no's API. It makes sense to investigate piggybacking on it.

e-alfred · 2020-11-09T14:36:51Z

@berdosi The old dashboard code should be removed because it is not useful anymore.

Do you have an idea on how to integrate the best way with the Weather Status app by @eneiluj? I am just thinking that maybe it shouldn't send the user to an external page but rather automatically add the preferred location to the Weather app if it is installed. Maybe a separate menu in the settings could allow the user to set their preferred option.

berdosi · 2020-11-10T00:34:03Z

Indeed it should be – unless someone's faster, I may open a PR for that soonish.

I know that currently the link in the Dashboard points to Windy.com, for the current coordinates.
An idea would be to implement #85 (geolocation), so that it could be linking into Weather app.

I see two ways of changing the link in the widget, in case the app is installed - and both are ugly:

either the Widget would be looking for the App, and change its behavior accordingly – which I don't see happening.
maybe, Weather app could use Util::addScript() (just like in a way Unsplash uses addStyle()), and patch up the dashboard widget's markup, if it exists. I don't like this.

There are probably more civilized ways of apps interopping with one another – I assume the Widget could expose an interface to let its forecast provider be changed by the apps (which would be similar to 1) above, but has a way better PR).

berdosi · 2020-11-10T00:34:45Z

Whoops, this has been closed in error.

e-alfred · 2020-12-28T10:14:04Z

@berdosi Do you think this is ready for merging?

berdosi · 2020-12-28T18:45:48Z

@e-alfred yes, I think it is:
I've upgraded the dependencies and solved the pending merge conflicts.
I am somewhat unsure whether 5c2ae40 commit can be reverted: app.js and angular.min.js are redundant, but putting them back was the easiest way to fix the conflict.

e-alfred · 2020-12-28T20:46:40Z

@berdosi It might be necessary to rebase on the latest master to get the most recent changes from there.

berdosi · 2020-12-29T01:21:16Z

@e-alfred Thanks for the tip – I like what I'm seeing now.
(I ended up force-pushing due to a failing DCO check.)

almereyda · 2021-02-09T19:10:38Z

It appears this PR is mergeable. Is there anything we can do as the community to support the maintainers in reviewing this PR, in so it can be merged?

Signed-off-by: Balint Erdosi <erdosib@gmail.com>

Update Dependencies

CarlSchwan

Code looks good, mostly nitpicks

Use async/await
Move store definition to another file
Forgot to translate a few strings

CarlSchwan · 2022-08-25T07:16:54Z

+ addCity(context, newCityName) {
+ axios.post(generateUrl('/apps/weather/city/add'), { name: newCityName })
+ .then((response) => {
+ showSuccess(`City added: ${newCityName}`)
+ if (response.data.id) {
+ // response contains the id, but not the name
+ context.commit('addCity', { name: newCityName, id: response.data.id })
+ }
+ // otherwise one may send a new API call : context.dispatch('loadCities')
+ })
+ .catch((reason) => {
+ logger.error('Error adding city', { reason })
+ showError(context.getters.fatalError)
+ })
+ },
+ loadCities(context) {
+ axios.get(generateUrl('/apps/weather/city/getall'))
+ .then((response) => {
+ const responseData = response.data
+ if (responseData.home) {
+ context.commit('setHome', responseData.home)
+ }
+ if (responseData.cities) {
+ context.commit('setCities', responseData.cities)
+ }
+ if (!context.state.loaded) {
+ if (responseData.home && !!responseData.cities.find(city => city.id === responseData.home)) {
+ // there is a home city set, and it hasnn't been removed before -> load it
+ context.dispatch('loadCity', responseData.home)
+ .then(() => { context.commit('setLoaded', true) })
+ } else if (responseData.cities && responseData.cities.length > 0) {
+ // load the first city, if no home city is set
+ context.dispatch('loadCity', responseData.cities[0].id)
+ }
+ }
+ })
+ .catch(reason => {
+ showError(context.getters.fatalError)
+ logger.error('Cannot load cities', { reason })
+ })
+ },
+ loadCity(context, cityId) {
+ const cityToLoad = context.state.allCities.cities.find(city => city.id === cityId)
+ if (!cityToLoad) return
+
+ axios.get(
+ generateUrl('/apps/weather/weather/get'),
+ { params: { name: cityToLoad.name } })
+ .then((response) => {
+ const currentCityData = response.data
+ currentCityData.wind.desc = windMapper(currentCityData.wind.deg)
+ currentCityData.image = imageMapper(currentCityData.weather[0].main)
+
+ context.commit('setCurrentCity', currentCityData)
+ context.commit('setSelected', cityToLoad.id)
+ })
+ .catch((reason) => {
+ showError(`Cannot load city: ${reason}`)
+ if (reason.status === 404) {
+ const error = t('weather', 'No city with this name found.')
+
+ showError(error)
+ context.commit('setCityLoadError', error)
+ context.commit('setApiKeyNeeded', false)
+ } else if (reason.status === 401) {
+ const error = t(
+ 'weather',
+ 'Your OpenWeatherMap API key is invalid. Contact your administrator to configure a valid API key in Additional Settings of the Administration')
+ showError(error)
+
+ context.commit('setCityLoadError', error)
+ context.commit('setApiKeyNeeded', true)
+ } else {
+ const error = context.getters.fatalError
+
+ showError(error)
+
+ logger.error('Error getting weather information for city', { reason })
+ context.commit('setCityLoadError', error)
+ context.commit('setApiKeyNeeded', false)
+ }
+
+ })
+ },
+ deleteCity(context, cityId) {
+ axios.post(generateUrl('/apps/weather/city/delete'), { id: cityId })
+ .then((response) => {
+ if (response.data != null && !!response.data.deleted) {
+ context.commit('removeCity', cityId)
+ // If current city is the removed city, close it
+ if (context.state.selectedCityId === cityId) {
+ context.commit('unsetSelected')
+ // if there are still cities on the list, and the selected was deleted, select the home city.
+ // if the home city was deleted, select the first one instead
+ if (context.state.allCities.cities.length > 0) {
+ context.dispatch(
+ 'loadCity',
+ cityId !== context.state.allCities.home
+ ? context.state.allCities.home
+ : context.state.allCities.cities[0].id)
+ }
+ }
+ } else {
+ alert(t('weather', 'Failed to remove city. Please contact your administrator'))
+ }
+ }).catch((reason) => {
+ showError(context.getters.fatalError)
+ logger.error('Error deleting city', { reason })
+ })
+ },
+ setHome(context, cityId) {
+ axios.post(generateUrl('/apps/weather/settings/home/set'), { city: cityId })
+ .then(response => {
+ if (response.data != null && !!response.data.set) {
+ context.commit('setHome', cityId)
+ } else {
+ showError(t('weather', 'Failed to set home. Please contact your administrator'))
+ }
+ })
+ .catch((reason) => {
+ logger.error('Error setting home city', { reason })
+ showError(context.getters.fatalError)
+ })
+ },
+ selectCity(context, cityId) {
+ context.dispatch('loadCity', cityId)
+ .then(() => {
+ context.commit('setSelected', cityId)
+ })
+ },
+ loadMetric(context) {
+ axios.get(generateUrl('/apps/weather/settings/metric/get'))
+ .then((result) => {
+ if (result.data.metric) {
+ context.commit('setMetric', result.data.metric)
+ context.commit('setMetricRepresentation', mapMetric(result.data.metric))
+ }
+ }).catch((reason) => {
+ logger.error('Error setting metric', { reason })
+ showError(context.getters.fatalError)
+ })
+ },
+ modifyMetric(context, metric) {
+ axios.post(generateUrl('/apps/weather/settings/metric/set'), { metric })
+ .then((result) => {
+ if (result.data != null && !!(result.data.set)) {
+ context.commit('setMetric', metric)
+ context.commit('setMetricRepresentation', mapMetric(metric))
+ context.dispatch('loadCity', context.state.selectedCityId)
+ } else {
+ showError(t('weather', 'Failed to set metric. Please contact your administrator'))
+ }
+ }).catch(
+ (reason) => {
+ if (reason.status === 404) {
+ showError(t('weather', 'This metric is not known.'))
+ } else {
+ logger.error('Error setting metric', { reason })
+ showError(context.getters.fatalError)
+ }
+ })
+ },
+	},


Suggested change
addCity(context,newCityName){
axios.post(generateUrl('/apps/weather/city/add'),{name: newCityName})
.then((response)=>{
showSuccess(`City added: ${newCityName}`)
if(response.data.id){
// response contains the id, but not the name
context.commit('addCity',{name: newCityName,id: response.data.id})
}
// otherwise one may send a new API call : context.dispatch('loadCities')
})
.catch((reason)=>{
logger.error('Error adding city',{ reason })
showError(context.getters.fatalError)
})
},
loadCities(context){
axios.get(generateUrl('/apps/weather/city/getall'))
.then((response)=>{
constresponseData=response.data
if(responseData.home){
context.commit('setHome',responseData.home)
}
if(responseData.cities){
context.commit('setCities',responseData.cities)
}
if(!context.state.loaded){
if(responseData.home&&!!responseData.cities.find(city=>city.id===responseData.home)){
// there is a home city set, and it hasnn't been removed before -> load it
context.dispatch('loadCity',responseData.home)
.then(()=>{context.commit('setLoaded',true)})
}elseif(responseData.cities&&responseData.cities.length>0){
// load the first city, if no home city is set
context.dispatch('loadCity',responseData.cities[0].id)
}
}
})
.catch(reason=>{
showError(context.getters.fatalError)
logger.error('Cannot load cities',{ reason })
})
},
loadCity(context,cityId){
constcityToLoad=context.state.allCities.cities.find(city=>city.id===cityId)
if(!cityToLoad)return
axios.get(
generateUrl('/apps/weather/weather/get'),
{params: {name: cityToLoad.name}})
.then((response)=>{
constcurrentCityData=response.data
currentCityData.wind.desc=windMapper(currentCityData.wind.deg)
currentCityData.image=imageMapper(currentCityData.weather[0].main)
context.commit('setCurrentCity',currentCityData)
context.commit('setSelected',cityToLoad.id)
})
.catch((reason)=>{
showError(`Cannot load city: ${reason}`)
if(reason.status===404){
consterror=t('weather','No city with this name found.')
showError(error)
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',false)
}elseif(reason.status===401){
consterror=t(
'weather',
'Your OpenWeatherMap API key is invalid. Contact your administrator to configure a valid API key in Additional Settings of the Administration')
showError(error)
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',true)
}else{
consterror=context.getters.fatalError
showError(error)
logger.error('Error getting weather information for city',{ reason })
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',false)
}
})
},
deleteCity(context,cityId){
axios.post(generateUrl('/apps/weather/city/delete'),{id: cityId})
.then((response)=>{
if(response.data!=null&&!!response.data.deleted){
context.commit('removeCity',cityId)
// If current city is the removed city, close it
if(context.state.selectedCityId===cityId){
context.commit('unsetSelected')
// if there are still cities on the list, and the selected was deleted, select the home city.
// if the home city was deleted, select the first one instead
if(context.state.allCities.cities.length>0){
context.dispatch(
'loadCity',
cityId!==context.state.allCities.home
? context.state.allCities.home
: context.state.allCities.cities[0].id)
}
}
}else{
alert(t('weather','Failed to remove city. Please contact your administrator'))
}
}).catch((reason)=>{
showError(context.getters.fatalError)
logger.error('Error deleting city',{ reason })
})
},
setHome(context,cityId){
axios.post(generateUrl('/apps/weather/settings/home/set'),{city: cityId})
.then(response=>{
if(response.data!=null&&!!response.data.set){
context.commit('setHome',cityId)
}else{
showError(t('weather','Failed to set home. Please contact your administrator'))
}
})
.catch((reason)=>{
logger.error('Error setting home city',{ reason })
showError(context.getters.fatalError)
})
},
selectCity(context,cityId){
context.dispatch('loadCity',cityId)
.then(()=>{
context.commit('setSelected',cityId)
})
},
loadMetric(context){
axios.get(generateUrl('/apps/weather/settings/metric/get'))
.then((result)=>{
if(result.data.metric){
context.commit('setMetric',result.data.metric)
context.commit('setMetricRepresentation',mapMetric(result.data.metric))
}
}).catch((reason)=>{
logger.error('Error setting metric',{ reason })
showError(context.getters.fatalError)
})
},
modifyMetric(context,metric){
axios.post(generateUrl('/apps/weather/settings/metric/set'),{ metric })
.then((result)=>{
if(result.data!=null&&!!(result.data.set)){
context.commit('setMetric',metric)
context.commit('setMetricRepresentation',mapMetric(metric))
context.dispatch('loadCity',context.state.selectedCityId)
}else{
showError(t('weather','Failed to set metric. Please contact your administrator'))
}
}).catch(
(reason)=>{
if(reason.status===404){
showError(t('weather','This metric is not known.'))
}else{
logger.error('Error setting metric',{ reason })
showError(context.getters.fatalError)
}
})
},
},
asyncaddCity(context,newCityName){
try{
const{ data }=awaitaxios.post(generateUrl('/apps/weather/city/add'),{name: newCityName})
showSuccess(`City added: ${newCityName}`)
if(data.id){
// response contains the id, but not the name
context.commit('addCity',{name: newCityName,id: response.data.id})
}
// otherwise one may send a new API call : context.dispatch('loadCities')
}catch(reason){
logger.error('Error adding city',{ reason })
showError(context.getters.fatalError)
}
},
asyncloadCities(context){
const{ data }=awaitaxios.get(generateUrl('/apps/weather/city/getall'))
try{
if(data.home){
context.commit('setHome',data.home)
}
if(data.cities){
context.commit('setCities',data.cities)
}
if(!context.state.loaded){
if(data.home&&!!data.cities.find(city=>city.id===data.home)){
// there is a home city set, and it hasnn't been removed before -> load it
context.dispatch('loadCity',responseData.home)
.then(()=>{context.commit('setLoaded',true)})
}elseif(data.cities&&data.cities.length>0){
// load the first city, if no home city is set
context.dispatch('loadCity',data.cities[0].id)
}
}
}catch(reason){
showError(context.getters.fatalError)
logger.error('Cannot load cities',{ reason })
}
},
asyncloadCity(context,cityId){
constcityToLoad=context.state.allCities.cities.find(city=>city.id===cityId)
if(!cityToLoad){
return
}
try{
const{ data }=awaitaxios.get(generateUrl('/apps/weather/weather/get'),{
params: {name: cityToLoad.name}
})
constcurrentCityData=data
currentCityData.wind.desc=windMapper(currentCityData.wind.deg)
currentCityData.image=imageMapper(currentCityData.weather[0].main)
context.commit('setCurrentCity',currentCityData)
context.commit('setSelected',cityToLoad.id)
}catch(reason){
showError(`Cannot load city: ${reason}`)
if(reason.status===404){
consterror=t('weather','No city with this name found.')
showError(error)
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',false)
}elseif(reason.status===401){
consterror=t(
'weather',
'Your OpenWeatherMap API key is invalid. Contact your administrator to configure a valid API key in Additional Settings of the Administration')
showError(error)
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',true)
}else{
consterror=context.getters.fatalError
showError(error)
logger.error('Error getting weather information for city',{ reason })
context.commit('setCityLoadError',error)
context.commit('setApiKeyNeeded',false)
}
}
},
asyncdeleteCity(context,cityId){
try{
const{ data }=awaitaxios.post(generateUrl('/apps/weather/city/delete'),{id: cityId})
if(data!=null&&!!data.deleted){
context.commit('removeCity',cityId)
// If current city is the removed city, close it
if(context.state.selectedCityId===cityId){
context.commit('unsetSelected')
// if there are still cities on the list, and the selected was deleted, select the home city.
// if the home city was deleted, select the first one instead
if(context.state.allCities.cities.length>0){
context.dispatch(
'loadCity',
cityId!==context.state.allCities.home
? context.state.allCities.home
: context.state.allCities.cities[0].id)
}
}
}else{
alert(t('weather','Failed to remove city. Please contact your administrator'))
}
}catch(reason){
showError(context.getters.fatalError)
logger.error('Error deleting city',{ reason })
}
},
asyncsetHome(context,cityId){
try{
const{ data }=awaitaxios.post(generateUrl('/apps/weather/settings/home/set'),{city: cityId})
if(data!=null&&!!data.set){
context.commit('setHome',cityId)
}else{
showError(t('weather','Failed to set home. Please contact your administrator'))
}
})
}catch(reason){
logger.error('Error setting home city',{ reason })
showError(context.getters.fatalError)
}
},
asyncselectCity(context,cityId){
awaitcontext.dispatch('loadCity',cityId)
context.commit('setSelected',cityId)
},
asyncloadMetric(context){
try{
const{ data }=awaitaxios.get(generateUrl('/apps/weather/settings/metric/get'))
if(data.metric){
context.commit('setMetric',data.metric)
context.commit('setMetricRepresentation',mapMetric(data.metric))
}
}catch(reason){
logger.error('Error setting metric',{ reason })
showError(context.getters.fatalError)
}
},
asyncmodifyMetric(context,metric){
try{
const{ data }=axios.post(generateUrl('/apps/weather/settings/metric/set'),{ metric })
if(data!=null&&!!(data.set)){
context.commit('setMetric',metric)
context.commit('setMetricRepresentation',mapMetric(metric))
context.dispatch('loadCity',context.state.selectedCityId)
}else{
showError(t('weather','Failed to set metric. Please contact your administrator'))
}
}catch(reason){
if(reason.status===404){
showError(t('weather','This metric is not known.'))
}else{
logger.error('Error setting metric',{ reason })
showError(context.getters.fatalError)
}
}
},
},

CarlSchwan · 2022-08-25T07:17:28Z

+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({


store definition should be moved to another file

Co-authored-by: Carl Schwan <carl@carlschwan.eu>

berdosi closed this Nov 10, 2020

berdosi reopened this Nov 10, 2020

berdosi mentioned this pull request Dec 22, 2020
Remove Legacy Dashboard Widget #95
Merged

e-alfred mentioned this pull request Dec 24, 2020
Update responsive view #83
Closed

berdosi force-pushed the vue-2-migrate branch from 082dac1 to 2f670f0Compare December 29, 2020 00:58

berdosi added 12 commits April 11, 2021 12:02

use Nextcloud components, draft main components
8bec209
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

implement vuex, make interface more uniform
88dac9c
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

extract CSS to separate file
c723769
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

update copyright, remove reference files
ac7d1bc
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

add logging
e738021
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

use separate CSS instead of bundling, rework responsivity
c3e27b8
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

split CurrentWeather, improve responsivity
c4905d2
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

improve responsivity
36ee79c
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

add periodic refresh
ecfb94e
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

fix typo in css, remove obsolete css file
66daec2
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

fix file permissions
e66019e
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

fix setting initial metric representation
2c3090b
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

berdosi added 3 commits April 11, 2021 12:04

make sure error is shown on top of the content panel
7e8e366
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

upgrade packages
20aaaf9
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

fix gitignore to include admin.js
cd75112
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

berdosi force-pushed the vue-2-migrate branch from e35a549 to cd75112Compare April 11, 2021 10:06

berdosiand others added 2 commits April 11, 2021 12:44

update dpendecies
9ab6942
Signed-off-by: Balint Erdosi <erdosib@gmail.com>

Merge pull request#4from berdosi/update-packages
6956d8e
Update Dependencies

CarlSchwan approved these changes Aug 25, 2022
View reviewed changes

nerzhuland others added 2 commits August 25, 2022 12:17

Update src/App.vue
f224d0d
Co-authored-by: Carl Schwan <carl@carlschwan.eu>

Update src/App.vue
c8cefd5
Co-authored-by: Carl Schwan <carl@carlschwan.eu>

-addCity(context,newCityName){
-axios.post(generateUrl('/apps/weather/city/add'),{name: newCityName})
-.then((response)=>{
-showSuccess(`City added: ${newCityName}`)
-if(response.data.id){
-// response contains the id, but not the name
-context.commit('addCity',{name: newCityName,id: response.data.id})
-}
-// otherwise one may send a new API call : context.dispatch('loadCities')
-})
-.catch((reason)=>{
-logger.error('Error adding city',{ reason })
-showError(context.getters.fatalError)
-})
-},
-loadCities(context){
-axios.get(generateUrl('/apps/weather/city/getall'))
-.then((response)=>{
-constresponseData=response.data
-if(responseData.home){
-context.commit('setHome',responseData.home)
-}
-if(responseData.cities){
-context.commit('setCities',responseData.cities)
-}
-if(!context.state.loaded){
-if(responseData.home&&!!responseData.cities.find(city=>city.id===responseData.home)){
-// there is a home city set, and it hasnn't been removed before -> load it
-context.dispatch('loadCity',responseData.home)
-.then(()=>{context.commit('setLoaded',true)})
-}elseif(responseData.cities&&responseData.cities.length>0){
-// load the first city, if no home city is set
-context.dispatch('loadCity',responseData.cities[0].id)
-}
-}
-})
-.catch(reason=>{
-showError(context.getters.fatalError)
-logger.error('Cannot load cities',{ reason })
-})
-},
-loadCity(context,cityId){
-constcityToLoad=context.state.allCities.cities.find(city=>city.id===cityId)
-if(!cityToLoad)return
-axios.get(
-generateUrl('/apps/weather/weather/get'),
-{params: {name: cityToLoad.name}})
-.then((response)=>{
-constcurrentCityData=response.data
-currentCityData.wind.desc=windMapper(currentCityData.wind.deg)
-currentCityData.image=imageMapper(currentCityData.weather[0].main)
-context.commit('setCurrentCity',currentCityData)
-context.commit('setSelected',cityToLoad.id)
-})
-.catch((reason)=>{
-showError(`Cannot load city: ${reason}`)
-if(reason.status===404){
-consterror=t('weather','No city with this name found.')
-showError(error)
-context.commit('setCityLoadError',error)
-context.commit('setApiKeyNeeded',false)
-}elseif(reason.status===401){
-consterror=t(
-'weather',
-'Your OpenWeatherMap API key is invalid. Contact your administrator to configure a valid API key in Additional Settings of the Administration')
-showError(error)
-context.commit('setCityLoadError',error)
-context.commit('setApiKeyNeeded',true)
-}else{
-consterror=context.getters.fatalError
-showError(error)
-logger.error('Error getting weather information for city',{ reason })
-context.commit('setCityLoadError',error)
-context.commit('setApiKeyNeeded',false)
-}
-})
-},
-deleteCity(context,cityId){
-axios.post(generateUrl('/apps/weather/city/delete'),{id: cityId})
-.then((response)=>{
-if(response.data!=null&&!!response.data.deleted){
-context.commit('removeCity',cityId)
-// If current city is the removed city, close it
-if(context.state.selectedCityId===cityId){
-context.commit('unsetSelected')
-// if there are still cities on the list, and the selected was deleted, select the home city.
-// if the home city was deleted, select the first one instead
-if(context.state.allCities.cities.length>0){
-context.dispatch(
-'loadCity',
-cityId!==context.state.allCities.home
- ? context.state.allCities.home
- : context.state.allCities.cities[0].id)
-}
-}
-}else{
-alert(t('weather','Failed to remove city. Please contact your administrator'))
-}
-}).catch((reason)=>{
-showError(context.getters.fatalError)
-logger.error('Error deleting city',{ reason })
-})
-},
-setHome(context,cityId){
-axios.post(generateUrl('/apps/weather/settings/home/set'),{city: cityId})
-.then(response=>{
-if(response.data!=null&&!!response.data.set){
-context.commit('setHome',cityId)
-}else{
-showError(t('weather','Failed to set home. Please contact your administrator'))
-}
-})
-.catch((reason)=>{
-logger.error('Error setting home city',{ reason })
-showError(context.getters.fatalError)
-})
-},
-selectCity(context,cityId){
-context.dispatch('loadCity',cityId)
-.then(()=>{
-context.commit('setSelected',cityId)
-})
-},
-loadMetric(context){
-axios.get(generateUrl('/apps/weather/settings/metric/get'))
-.then((result)=>{
-if(result.data.metric){
-context.commit('setMetric',result.data.metric)
-context.commit('setMetricRepresentation',mapMetric(result.data.metric))
-}
-}).catch((reason)=>{
-logger.error('Error setting metric',{ reason })
-showError(context.getters.fatalError)
-})
-},
-modifyMetric(context,metric){
-axios.post(generateUrl('/apps/weather/settings/metric/set'),{ metric })
-.then((result)=>{
-if(result.data!=null&&!!(result.data.set)){
-context.commit('setMetric',metric)
-context.commit('setMetricRepresentation',mapMetric(metric))
-context.dispatch('loadCity',context.state.selectedCityId)
-}else{
-showError(t('weather','Failed to set metric. Please contact your administrator'))
-}
-}).catch(
-(reason)=>{
-if(reason.status===404){
-showError(t('weather','This metric is not known.'))
-}else{
-logger.error('Error setting metric',{ reason })
-showError(context.getters.fatalError)
-}
-})
-},
-},
+asyncaddCity(context,newCityName){
+try{
+const{ data }=awaitaxios.post(generateUrl('/apps/weather/city/add'),{name: newCityName})
+showSuccess(`City added: ${newCityName}`)
+if(data.id){
+// response contains the id, but not the name
+context.commit('addCity',{name: newCityName,id: response.data.id})
+}
+// otherwise one may send a new API call : context.dispatch('loadCities')
+}catch(reason){
+logger.error('Error adding city',{ reason })
+showError(context.getters.fatalError)
+}
+},
+asyncloadCities(context){
+const{ data }=awaitaxios.get(generateUrl('/apps/weather/city/getall'))
+try{
+if(data.home){
+context.commit('setHome',data.home)
+}
+if(data.cities){
+context.commit('setCities',data.cities)
+}
+if(!context.state.loaded){
+if(data.home&&!!data.cities.find(city=>city.id===data.home)){
+// there is a home city set, and it hasnn't been removed before -> load it
+context.dispatch('loadCity',responseData.home)
+.then(()=>{context.commit('setLoaded',true)})
+}elseif(data.cities&&data.cities.length>0){
+// load the first city, if no home city is set
+context.dispatch('loadCity',data.cities[0].id)
+}
+}
+}catch(reason){
+showError(context.getters.fatalError)
+logger.error('Cannot load cities',{ reason })
+}
+},
+asyncloadCity(context,cityId){
+constcityToLoad=context.state.allCities.cities.find(city=>city.id===cityId)
+if(!cityToLoad){
+return
+}
+try{
+const{ data }=awaitaxios.get(generateUrl('/apps/weather/weather/get'),{
+ params: {name: cityToLoad.name}
+})
+constcurrentCityData=data
+currentCityData.wind.desc=windMapper(currentCityData.wind.deg)
+currentCityData.image=imageMapper(currentCityData.weather[0].main)
+context.commit('setCurrentCity',currentCityData)
+context.commit('setSelected',cityToLoad.id)
+}catch(reason){
+showError(`Cannot load city: ${reason}`)
+if(reason.status===404){
+consterror=t('weather','No city with this name found.')
+showError(error)
+context.commit('setCityLoadError',error)
+context.commit('setApiKeyNeeded',false)
+}elseif(reason.status===401){
+consterror=t(
+'weather',
+'Your OpenWeatherMap API key is invalid. Contact your administrator to configure a valid API key in Additional Settings of the Administration')
+showError(error)
+context.commit('setCityLoadError',error)
+context.commit('setApiKeyNeeded',true)
+}else{
+consterror=context.getters.fatalError
+showError(error)
+logger.error('Error getting weather information for city',{ reason })
+context.commit('setCityLoadError',error)
+context.commit('setApiKeyNeeded',false)
+}
+}
+},
+asyncdeleteCity(context,cityId){
+try{
+const{ data }=awaitaxios.post(generateUrl('/apps/weather/city/delete'),{id: cityId})
+if(data!=null&&!!data.deleted){
+context.commit('removeCity',cityId)
+// If current city is the removed city, close it
+if(context.state.selectedCityId===cityId){
+context.commit('unsetSelected')
+// if there are still cities on the list, and the selected was deleted, select the home city.
+// if the home city was deleted, select the first one instead
+if(context.state.allCities.cities.length>0){
+context.dispatch(
+'loadCity',
+cityId!==context.state.allCities.home
+ ? context.state.allCities.home
+ : context.state.allCities.cities[0].id)
+}
+}
+}else{
+alert(t('weather','Failed to remove city. Please contact your administrator'))
+}
+}catch(reason){
+showError(context.getters.fatalError)
+logger.error('Error deleting city',{ reason })
+}
+},
+asyncsetHome(context,cityId){
+try{
+const{ data }=awaitaxios.post(generateUrl('/apps/weather/settings/home/set'),{city: cityId})
+if(data!=null&&!!data.set){
+context.commit('setHome',cityId)
+}else{
+showError(t('weather','Failed to set home. Please contact your administrator'))
+}
+})
+}catch(reason){
+logger.error('Error setting home city',{ reason })
+showError(context.getters.fatalError)
+}
+},
+asyncselectCity(context,cityId){
+awaitcontext.dispatch('loadCity',cityId)
+context.commit('setSelected',cityId)
+},
+asyncloadMetric(context){
+try{
+const{ data }=awaitaxios.get(generateUrl('/apps/weather/settings/metric/get'))
+if(data.metric){
+context.commit('setMetric',data.metric)
+context.commit('setMetricRepresentation',mapMetric(data.metric))
+}
+}catch(reason){
+logger.error('Error setting metric',{ reason })
+showError(context.getters.fatalError)
+}
+},
+asyncmodifyMetric(context,metric){
+try{
+const{ data }=axios.post(generateUrl('/apps/weather/settings/metric/set'),{ metric })
+if(data!=null&&!!(data.set)){
+context.commit('setMetric',metric)
+context.commit('setMetricRepresentation',mapMetric(metric))
+context.dispatch('loadCity',context.state.selectedCityId)
+}else{
+showError(t('weather','Failed to set metric. Please contact your administrator'))
+}
+}catch(reason){
+if(reason.status===404){
+showError(t('weather','This metric is not known.'))
+}else{
+logger.error('Error setting metric',{ reason })
+showError(context.getters.fatalError)
+}
+}
+},
+},

Uh oh!

Conversation

berdosi commented Oct 21, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

e-alfred commented Nov 1, 2020

Uh oh!

nerzhul commented Nov 3, 2020

Uh oh!

berdosi commented Nov 8, 2020

Uh oh!

e-alfred commented Nov 9, 2020

Uh oh!

berdosi commented Nov 9, 2020

Uh oh!

e-alfred commented Nov 9, 2020

Uh oh!

berdosi commented Nov 10, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

berdosi commented Nov 10, 2020

Uh oh!

e-alfred commented Dec 28, 2020

Uh oh!

berdosi commented Dec 28, 2020

Uh oh!

e-alfred commented Dec 28, 2020

Uh oh!

berdosi commented Dec 29, 2020

Uh oh!

almereyda commented Feb 9, 2021

Uh oh!

CarlSchwan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

CarlSchwanAug 25, 2022

Choose a reason for hiding this comment

Uh oh!

CarlSchwanAug 25, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

berdosi commented Oct 21, 2020•
edited
Loading

berdosi commented Nov 10, 2020•
edited
Loading