[IMPROVE] New sidebar layout #19089

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.

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

Merged

gabriellsh merged 204 commits into develop from feat/sidebar

Oct 26, 2020

.storybook/mocks/meteor.js

-Original file line number
+Diff line change
@@ -1,4 +1,7 @@
     export const Meteor = {
+    	Device: {
+    		isDesktop: () => false,
+    	},
     	isClient: true,
     	isServer: false,
     	_localStorage: window.localStorage,
@@ Expand Down @@

.storybook/webpack.config.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ module.exports = async ({ config }) => { @@
     			require.resolve('./mocks/meteor.js'),
     		),
     		new webpack.NormalModuleReplacementPlugin(
-    			/\/server(\/index.js)$/,
+    			/(app)\/*.*\/(server)\/*/,
     			require.resolve('./mocks/empty.js'),
     		),
     	);
@@ Expand Down @@

app/discussion/client/index.js

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     // Templates
     import './views/creationDialog/CreateDiscussion';
-    import './views/DiscussionList';
     import './views/DiscussionTabbar';
     // Other UI extensions
@@ Expand Down @@

app/discussion/client/views/DiscussionList.html

This file was deleted.

app/discussion/client/views/DiscussionList.js

This file was deleted.

app/discussion/lib/discussionRoomType.js

-Original file line number
+Diff line change
@@ -1,6 +1,4 @@
-    import { Meteor } from 'meteor/meteor';
-    import { RoomTypeConfig, roomTypes, getUserPreference } from '../../utils';
+    import { RoomTypeConfig, roomTypes } from '../../utils';
     export class DiscussionRoomType extends RoomTypeConfig {
     	constructor() {
@@ Expand All / @@ -9,13 +7,6 @@ export class DiscussionRoomType extends RoomTypeConfig { @@
     			order: 25,
     			label: 'Discussion',
     		});
-    		// we need a custom template in order to have a custom query showing the subscriptions to discussions
-    		this.customTemplate = 'DiscussionList';
-    	}
-    	condition() {
-    		return getUserPreference(Meteor.userId(), 'sidebarShowDiscussion');
     	}
     }
@@ Expand Down @@

app/livechat/client/index.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,5 @@ import './hooks/onCreateRoomTabBar'; @@
     import './startup/notifyUnreadRooms';
     import './views/app/dialog/closeRoom';
     import './stylesheets/livechat.css';
-    import './views/sideNav/livechat';
     import './externalFrame';
     import './lib/messageTypes';

app/livechat/client/lib/stream/queueManager.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,76 +1,88 @@
  
    import { APIClient } from '../../../../utils/client';

    import { LivechatInquiry } from '../../collections/LivechatInquiry';

    import { inquiryDataStream } from './inquiry';

    import { hasRole } from '../../../../authorization/client';

    import { call } from '../../../../ui-utils/client';

    let agentDepartments = [];

    const departments = new Set();

    const events = {

    	added: (inquiry) => {

    		delete inquiry.type;

    		LivechatInquiry.insert(inquiry);

    		departments.has(inquiry.department) && LivechatInquiry.insert({ ...inquiry, alert: true, _updatedAt: new Date(inquiry._updatedAt) });

    	},

    	changed: (inquiry) => {

    		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {

    		if (inquiry.status !== 'queued' || (inquiry.department && !departments.has(inquiry.department))) {

    			return LivechatInquiry.remove(inquiry._id);

    		}

    		delete inquiry.type;

    		LivechatInquiry.upsert({ _id: inquiry._id }, inquiry);

    		LivechatInquiry.upsert({ _id: inquiry._id }, { ...inquiry, alert: true, _updatedAt: new Date(inquiry._updatedAt) });

    	},

    	removed: (inquiry) => LivechatInquiry.remove(inquiry._id),

    };

    const updateCollection = (inquiry) => { events[inquiry.type](inquiry); };

    const appendListenerToDepartment = (departmentId) => inquiryDataStream.on(`department/${ departmentId }`, updateCollection);

    const removeListenerOfDepartment = (departmentId) => inquiryDataStream.removeListener(`department/${ departmentId }`, updateCollection);

    const getInquiriesFromAPI = async (url) => {

    	const { inquiries } = await APIClient.v1.get(url);

    const getInquiriesFromAPI = async () => {

    	const { inquiries } = await APIClient.v1.get('livechat/inquiries.queued?sort={"ts": 1}');

    	return inquiries;

    };

    const updateInquiries = async (inquiries) => {

    	(inquiries || []).forEach((inquiry) => LivechatInquiry.upsert({ _id: inquiry._id }, inquiry));

    const removeListenerOfDepartment = (departmentId) => {

    	inquiryDataStream.removeListener(`department/${ departmentId }`, updateCollection);

    	departments.delete(departmentId);

    };

    const appendListenerToDepartment = (departmentId) => {

    	departments.add(departmentId);

    	inquiryDataStream.on(`department/${ departmentId }`, updateCollection);

    	return () => removeListenerOfDepartment(departmentId);

    };

    const addListenerForeachDepartment = async (departments = []) => {

    	const cleanupFunctions = departments.map((department) => appendListenerToDepartment(department));

    	return () => cleanupFunctions.forEach((cleanup) => cleanup());

    };

    const updateInquiries = async (inquiries = []) => inquiries.forEach((inquiry) => LivechatInquiry.upsert({ _id: inquiry._id }, { ...inquiry, _updatedAt: new Date(inquiry._updatedAt) }));

    const getAgentsDepartments = async (userId) => {

    	const { departments } = await APIClient.v1.get(`livechat/agents/${ userId }/departments?enabledDepartmentsOnly=true`);

    	return departments;

    };

    const addListenerForeachDepartment = async (userId, departments) => {

    	if (departments && Array.isArray(departments) && departments.length) {

    		departments.forEach((department) => appendListenerToDepartment(department));

    	}

    };

    const removeDepartmentsListeners = (departments) => {

    	(departments || []).forEach((department) => removeListenerOfDepartment(department._id));

    };

    const removeGlobalListener = () => inquiryDataStream.removeListener('public', updateCollection);

    const removeGlobalListener = () => {

    	inquiryDataStream.removeListener('public', updateCollection);

    const addGlobalListener = () => {

    	inquiryDataStream.on('public', updateCollection);

    	return removeGlobalListener;

    };

    export const initializeLivechatInquiryStream = async (userId) => {

    	LivechatInquiry.remove({});

    	if (agentDepartments.length) {

    		removeDepartmentsListeners(agentDepartments);

    	}

    	removeGlobalListener();

    const subscribe = async (userId, isManager) => {

    	const config = await call('livechat:getRoutingConfig');

    	if (config && config.autoAssignAgent) {

    		return;

    	}

    	await updateInquiries(await getInquiriesFromAPI('livechat/inquiries.queued?sort={"ts": 1}'));

    	const agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);

    	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);

    	await addListenerForeachDepartment(userId, agentDepartments);

    	if (agentDepartments.length === 0 || hasRole(userId, 'livechat-manager')) {

    		inquiryDataStream.on('public', updateCollection);

    	}

    	const cleanUp = agentDepartments.length ? await addListenerForeachDepartment(agentDepartments) : isManager && addGlobalListener();

    	updateInquiries(await getInquiriesFromAPI());

    	return () => {

    		LivechatInquiry.remove({});

    		removeGlobalListener();

    		cleanUp && cleanUp();

    		departments.clear();

    	};

    };

    export const initializeLivechatInquiryStream = (() => {

    	let cleanUp;

    	return async (...args) => {

    		cleanUp && cleanUp();

    		cleanUp = await subscribe(...args);

    	};

    })();

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[IMPROVE] New sidebar layout #19089

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!