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

Fix regression bug with active sessions (backport to 3.1) #2804

Merged
merged 2 commits into from
Jun 27, 2019
Merged

Fix regression bug with active sessions (backport to 3.1) #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae0f882
Fix regression bug with active sessions
alex-kovoy Jun 27, 2019
5755a74
dist and e-ref
alex-kovoy Jun 27, 2019
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
2 changes: 1 addition & 1 deletion e
Open in desktop
Submodule e updated from 6378c7 to 8fb0b6
7 changes: 4 additions & 3 deletions web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM node:8.11.2-slim

RUN apt-get update && apt-get install -y python python-dev python-pip

RUN npm i [email protected] -g
# Fixes jessie repository
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
RUN apt-get update && apt-get install git -y && apt-get install -y python python-dev python-pip
RUN npm i [email protected] -g

# prepare to install only package.json dependencies
RUN mkdir -p /app
Expand Down
5 changes: 1 addition & 4 deletions web/dist/app/app.1d3783820436ca0292c1.js → web/dist/app/app.24a060de91be02b343c3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21846,7 +21846,6 @@ webpackJsonp([0],[
id: undefined,
namespace: undefined,
login: undefined,
active: undefined,
created: undefined,
last_active: undefined,
server_id: undefined,
Expand Down Expand Up @@ -21880,9 +21879,7 @@ webpackJsonp([0],[

var jsonArray = json || [];
var newState = defaultState().withMutations(function (newState) {
return jsonArray.filter(function (item) {
return item.active === true;
}).forEach(function (item) {
return jsonArray.forEach(function (item) {
var rec = createSessionRec(siteId, item);
newState.set(rec.id, rec);
});
Expand Down
0 web/dist/app/styles.1d3783820436ca0292c1.js → web/dist/app/styles.24a060de91be02b343c3.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion web/dist/app/vendor.1d3783820436ca0292c1.js → web/dist/app/vendor.24a060de91be02b343c3.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
<link rel="shortcut icon" href="/web/app/favicon.ico"><link href="/web/app/vendor.152a22f00cda8e3acc388ada3c83b2f6.css" rel="stylesheet"></head>
<body class="grv">
<div id="app"></div>
<script type="text/javascript" src="/web/app/vendor.1d3783820436ca0292c1.js"></script><script type="text/javascript" src="/web/app/styles.1d3783820436ca0292c1.js"></script><script type="text/javascript" src="/web/app/app.1d3783820436ca0292c1.js"></script></body>
<script type="text/javascript" src="/web/app/vendor.24a060de91be02b343c3.js"></script><script type="text/javascript" src="/web/app/styles.24a060de91be02b343c3.js"></script><script type="text/javascript" src="/web/app/app.24a060de91be02b343c3.js"></script></body>
</html>
22 changes: 10 additions & 12 deletions web/src/app/flux/sessions/activeSessionStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ import { Record, List } from 'immutable';

import { RECEIVE_ACTIVE_SESSIONS } from './actionTypes';

const ActiveSessionRec = Record({
const ActiveSessionRec = Record({
id: undefined,
namespace: undefined,
namespace: undefined,
login: undefined,
active: undefined,
created: undefined,
last_active: undefined,
server_id: undefined,
siteId: undefined,
parties: List()
parties: List()
})

const PartyRecord = Record({
Expand All @@ -37,14 +36,14 @@ const PartyRecord = Record({
serverId: undefined
})

const defaultState = () => toImmutable({});
const defaultState = () => toImmutable({});

export default Store({
getInitialState() {
return defaultState();
},

initialize() {
initialize() {
this.on(RECEIVE_ACTIVE_SESSIONS, receive);
}
})
Expand All @@ -54,14 +53,13 @@ function receive(state, { siteId, json }) {
const jsonArray = json || [];
const newState = defaultState().withMutations(newState =>
jsonArray
.filter(item => item.active === true)
.forEach(item => {
const rec = createSessionRec(siteId, item);
newState.set(rec.id, rec);
})
);
return newState.equals(state) ? state : newState;

return newState.equals(state) ? state : newState;
}

function createSessionRec(siteId, json) {
Expand All @@ -77,9 +75,9 @@ function createSessionRec(siteId, json) {

function createParties(jsonArray) {
jsonArray = jsonArray || [];
const list = new List();
const list = new List();
return list.withMutations(list => {
jsonArray.forEach(item => {
jsonArray.forEach(item => {
const party = new PartyRecord({
user: item.user,
serverIp: item.remote_addr,
Expand All @@ -88,5 +86,5 @@ function createParties(jsonArray) {

list.push(party)
})
})
})
}