Add external user support realtime

backend/packages.pip

@@ -9,7 +9,7 @@ Flask-Sockets==0.2.1
 Flask-SQLAlchemy==2.1
 Flask-Migrate==2.0.3
 pyjwt==1.4.2
-psycopg2==2.7.4
+psycopg2==2.9.3
 python-dateutil==2.6.0
 python-dotenv==0.6.3
 requests==2.24.0

backend/src/models.py

@@ -102,7 +102,9 @@ class Entry(Base, db.Model):
         backref=db.backref('entries', lazy='dynamic', cascade='all, delete-orphan'))
 
     def parse(self, data, currentUser, reqType):
-        if currentUser:
+        is_new = self.id is None
+
+        if is_new and currentUser:
             data['user'] = currentUser.id
 
         if reqType == 'save' and currentUser and currentUser.has_running_entries():
@@ -161,4 +163,4 @@ class Ticket(Base, db.Model):
 
     # Errors will occur if the name of the ticket is longer than the maximum length
     # So better safe than sorry
-    name = db.Column(db.String(500))
+    name = db.Column(db.String(500))

cy/pkg

@@ -15,13 +15,13 @@ version: FORCE
 build: FORCE build-be build-fe
 
 build-fe: FORCE
-	cd frontend && yarn --no-progress
+	cd frontend && yarn --frozen-lockfile
 	cd frontend && yarn run build
 	mv frontend/build static
 
 build-be: FORCE
 	virtualenv --python=python3 venv
-	. venv/bin/activate && pip install -U pip==9.0.1
+	. venv/bin/activate && pip install -U pip==21.3.1
 	mkdir backend/packages/
 	. venv/bin/activate && cd backend/packages/ && pip download -r ../packages.pip
 	. venv/bin/activate && pip install -U backend/packages/*
@@ -43,7 +43,7 @@ pre-install: FORCE
 
 install: FORCE
 	# Sigh. Need download to install pip that can do offline installs :(
-	pip install -U pip==9.0.1
+	pip install -U pip==21.3.1
 	pip install -U backend/packages/*
 	cd backend && ./manage.py db upgrade
 

frontend/src/component/Entry/Project.js

@@ -42,15 +42,15 @@ export default class EntryProject extends Component {
     };
 
     render() {
-        const { entry, allowEdit } = this.props;
+        const { entry, allowEdit, viewStore } = this.props;
         const project = entry.project
             ? this.props.projectStore.get(entry.project)
             : null;
 
         let projectOptions = [];
         for(let index = 0; index < this.props.projectStore.models.length; index++){
             const model = this.props.projectStore.models[index];
-            if(model && model.isActive){
+            if(model && model.isActive && viewStore.currentUser.isAllowedProject(model)){
                 projectOptions.push(formatProjectToOption(model));
             }
         }

frontend/src/container/AppHeader.js

@@ -40,12 +40,16 @@ export default class Header extends Component {
                 <TopMenuLink activeClassName="selected" exact to="/">
                     My time
                 </TopMenuLink>
-                <TopMenuLink activeClassName="selected" to="/users">
-                    Employees
-                </TopMenuLink>
-                <TopMenuLink activeClassName="selected" to="/projects">
-                    Projects
-                </TopMenuLink>
+                {!this.props.store.currentUser.isExternal && (
+                    <div style={{ display: 'inherit' }}>
+                        <TopMenuLink activeClassName="selected" to="/users">
+                            Employees
+                        </TopMenuLink>
+                        <TopMenuLink activeClassName="selected" to="/projects">
+                            Projects
+                        </TopMenuLink>
+                    </div>
+                )}
                 <TopMenuLink activeClassName="selected" to="/archive">
                     Archive
                 </TopMenuLink>

frontend/src/container/EntryOverviewItem.js

@@ -12,6 +12,7 @@ import Icon from 'component/Icon';
 import { ProjectStore } from 'store/Project';
 import { UserStore } from 'store/User';
 import { Entry } from 'store/Entry';
+import View from 'store/View';
 import IconDelete from 'image/icon-delete.svg';
 import IconCopy from 'image/icon-copy.svg';
 import IconTicketLink from 'image/icon-ticket-link.svg';
@@ -29,6 +30,7 @@ export default class EntryOverviewItem extends Component {
         onCopy: PropTypes.func.isRequired,
         projectStore: PropTypes.instanceOf(ProjectStore).isRequired,
         userStore: PropTypes.instanceOf(UserStore),
+        viewStore: PropTypes.instanceOf(View).isRequired,
         allowEdit: PropTypes.bool,
     };
 
@@ -48,7 +50,7 @@ export default class EntryOverviewItem extends Component {
     };
 
     render() {
-        const { entry, allowEdit, projectStore } = this.props;
+        const { entry, allowEdit, projectStore, viewStore } = this.props;
         const diffMinutes = entry.differenceInMinutes;
 
         const wbso = entry.wbso;
@@ -72,6 +74,7 @@ export default class EntryOverviewItem extends Component {
                     entry={entry}
                     projectStore={projectStore}
                     allowEdit={allowEdit}
+                    viewStore={viewStore}
                 />
                 <EntryItemActions>
                     <a

frontend/src/container/TimeEntry.js

@@ -137,12 +137,12 @@ export default class TimeEntry extends Component {
     }
 
     render() {
-        const { entry } = this.props;
+        const { entry, viewStore } = this.props;
 
         let projectOptions = [];
         for(let index = 0; index < this.props.projectStore.models.length; index++){
             const model = this.props.projectStore.models[index];
-            if(model && model.isActive){
+            if(model && model.isActive && viewStore.currentUser.isAllowedProject(model)){
                 projectOptions.push(this.formatProjectToOption(model));
             }
         }

frontend/src/screen/UserEntries.js

@@ -54,8 +54,10 @@ export default class UserEntriesScreen extends Component {
             <div>
                 <Title>Employee {user ? user.displayName : 'Unknown'}</Title>
                 <EntryOverview
+                    viewStore={this.props.viewStore}
                     entries={this.entryStore}
                     projectStore={this.projectStore}
+                    allowEdit={this.props.viewStore.currentUser.pmc === 'Management'}
                 />
             </div>
         );

frontend/src/store/User.js

@@ -1,5 +1,15 @@
-import { observable } from 'mobx';
+import { observable, computed } from 'mobx';
 import { Model, Store } from './Base';
+import { trimStart } from 'lodash';
+
+// Defines if a user is "external". The RealTime UI will hide certain menu
+// items. Example:
+//
+// ext.Project X
+//
+// This way menu items are hidden, and only projects with name which matches
+// the prefix "Project X" will be shown.
+const EXTERNAL_PMC_PREFIX = 'ext.';
 
 export class User extends Model {
     target = 'user';
@@ -11,6 +21,22 @@ export class User extends Model {
     @observable pmc = '';
     @observable stillWorking = '';
 
+    @computed
+    get isExternal() {
+        // Super secure.
+        return this.pmc.startsWith(EXTERNAL_PMC_PREFIX);
+    }
+
+    isAllowedProject(project) {
+        if (this.isExternal) {
+            const allowedPrefix = trimStart(this.pmc, EXTERNAL_PMC_PREFIX);
+
+            return project.name.startsWith(allowedPrefix);
+        }
+
+        return true;
+    }
+
     setToken(token) {
         localStorage.setItem('jwt-auth-token', token);
     }