Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 24.12.01 #133

Merged
merged 11 commits into from
Apr 12, 2024
Merged

Release 24.12.01 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d663d49
Fix | enforce event trigger
Mar 12, 2024
3d4a29e
adding async
Mar 12, 2024
979c465
adding try catch
Mar 12, 2024
c074777
Merge pull request #129 from aplijobs/fix/newConv
cmm-apli Mar 12, 2024
e050623
Merge branch 'trunk' into develop
cmm-apli Mar 14, 2024
cee9e1a
clear quick replies from vuex action (#131)
Arjona99 Mar 22, 2024
06fe8b2
Merge branch 'trunk' into develop
cmm-apli Mar 22, 2024
71f394e
Fix | Rollback last change (#134)
Arjona99 Mar 25, 2024
79f5f9a
Removed Alpine repository for vips
Apr 4, 2024
1ae7780
Merge pull request #135 from aplijobs/fix/dockerfile/alpine-vips
AranGarcia Apr 4, 2024
97629f3
clear quick replies when new message arrives (#136)
Arjona99 Apr 9, 2024
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
7 changes: 6 additions & 1 deletion app/javascript/widget/store/modules/conversation/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,13 @@ export const actions = {
commit('clearConversations');
},

addOrUpdateMessage: async ({ commit }, data) => {
addOrUpdateMessage: async ({ commit, state }, data) => {
const { id, content_attributes } = data;
const { quickReplies } = state;
// If there are quick replies active, remove them before showing the new message
if (quickReplies.options.length > 0) {
commit('setQuickRepliesOptions', []);
}
if (content_attributes && content_attributes.deleted) {
commit('deleteMessage', id);
return;
Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ ENV NODE_OPTIONS ${NODE_OPTIONS}

ENV BUNDLE_PATH="/gems"

RUN apk add --update --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main vips

RUN apk update && apk add --no-cache \
openssl \
tar \
Expand Down Expand Up @@ -97,8 +95,6 @@ ARG RAILS_ENV=production
ENV RAILS_ENV ${RAILS_ENV}
ENV BUNDLE_PATH="/gems"

RUN apk add --update --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main vips

RUN apk update && apk add --no-cache \
build-base \
openssl \
Expand Down
Loading