[WIP]Diff of Assistify and Rocket.Chat #14982
Conversation
|
|
| <template name="permissionsTable"> | ||
| <table class="permission-grid secondary-background-color"> | ||
| <thead class="content-background-color"> | ||
| <tr> |
| @@ -1297,6 +1297,27 @@ export class Subscriptions extends Base { | |||
| return result; | |||
| } | |||
|
|
|||
| hideOldByUserId(userId, thresholdDate) { | |||
mrsimpson
changed the title
app/ui-utils/client/lib/openRoom.js
Outdated
| @@ -1,9 +1,9 @@ | |||
| import { Meteor } from 'meteor/meteor'; | |||
| import { Tracker } from 'meteor/tracker'; | |||
| import { Blaze } from 'meteor/blaze'; | |||
| import { BlazeLayout } from 'meteor/kadira:blaze-layout'; | |||
There was a problem hiding this comment.
Is it really necessary to move this import?
.circleci/config.yml
Outdated
| @@ -15,9 +15,10 @@ test-install-dependencies: &test-install-dependencies | |||
| sudo apt-get install -y mongodb-org-shell google-chrome-stable | |||
|
|
|||
| test-run: &test-run | |||
| name: Run Tests | |||
| command: | | |||
| for i in $(seq 1 5); do mongo rocketchat --eval 'db.dropDatabase()' && npm test && s=0 && break || s=$? && sleep 1; done; (exit $s) | |||
There was a problem hiding this comment.
No PR
We decided our automated testing should run differently compared to RC: We don't want to retry the whole testsuite if one test failed, but we'll be executing the tests file-by-file.
.circleci/config.yml
Outdated
| for i in $(seq 1 5); do mongo rocketchat --eval 'db.dropDatabase()' && npm test && s=0 && break || s=$? && sleep 1; done; (exit $s) | ||
| name: Run Tests | ||
| command: | | ||
| if [[ $DISABLE_SMARTI ]]; then rm -rf ./tests/end-to-end/ui_smarti; fi; |
There was a problem hiding this comment.
Smarti tests can currently not run on our CI due to memory limits. => These tests can be remove based on the ENV
.docker/Dockerfile.local
Outdated
| @@ -1,20 +1,55 @@ | |||
| FROM node:8 | |||
| FROM ubuntu:16.04 as builder | |||
There was a problem hiding this comment.
NO PR
We're using our own docker configuration to build the chat completely in the builder.
RC itself just downloads the source from its releases in order to create the docker image.
.dockerignore
Outdated
| @@ -1,5 +1,82 @@ | |||
| **/bin/** | |||
There was a problem hiding this comment.
NO PR
we just need to ignore more since we're really building from source during the docker build
.scripts/continueTesting.sh
Outdated
| @@ -0,0 +1,33 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
NO PR
Dedicated script allowing to try a UI test multiple times without always starting from scratch
.scripts/deploy-assistify-chat.sh
Outdated
| @@ -0,0 +1,56 @@ | |||
| #!/usr/bin/env bash | |||
There was a problem hiding this comment.
NO PR
This file holds the instructions where and how to package which artifacts in order to get them running on our servers
.scripts/separateTesting.sh
Outdated
| @@ -0,0 +1,23 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
NO PR
This is only a helper for local testing.
.scripts/start.js
Outdated
| @@ -110,10 +110,7 @@ function startApp(callback) { | |||
| function startChimp() { | |||
| startProcess({ | |||
| name: 'Chimp', | |||
| command: 'npm', | |||
There was a problem hiding this comment.
NO PR
This changes the default test command to utilize our one-by-one-testing mechanism
HISTORY.md
Outdated
| @@ -1,3 +1,63 @@ | |||
| # Assistify 0.9.9 | |||
There was a problem hiding this comment.
NO PR
We add our Assistify.Chat-history always on top of the last entry. This keeps the diff cleaner
app/assets/server/assets.js
Outdated
| @@ -20,7 +20,7 @@ const RocketChatAssetsInstance = new RocketChatFile.GridFS({ | |||
| const assets = { | |||
There was a problem hiding this comment.
No PR. This file holds the logo and assets for assistify.
|
need to re-open in order to hopefully update the changelist. Please do neither merge nor close. |
app/assistify/ai/README.md
Outdated
| @@ -0,0 +1,3 @@ | |||
| This package contains all the Smarti-"AI" which aims at accelerating the current conversation. | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
| @@ -0,0 +1,11 @@ | |||
| // import { TAPi18n } from 'meteor/tap:i18n'; | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
| import { callbacks } from '../../../../callbacks/client'; | ||
|
|
||
| /** | ||
| * Makes the knowledge base panel open on opening a room in which it is active |
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
app/assistify/ai/client/index.js
Outdated
| @@ -0,0 +1,10 @@ | |||
| import '../models/AssistifySmarti.js'; | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
| @@ -0,0 +1,43 @@ | |||
| import s from 'underscore.string'; | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
| @@ -0,0 +1,7 @@ | |||
| import { ChatMessages } from '../../../../ui'; | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify AI package.
| @@ -1,22 +1,24 @@ | |||
| { | |||
| @@ -0,0 +1,879 @@ | |||
| { | |||
| @@ -0,0 +1 @@ | |||
| node_modules | |||
There was a problem hiding this comment.
Already removed in the RC core.
| @@ -0,0 +1,7 @@ | |||
| This directory and the files immediately inside it are automatically generated | |||
There was a problem hiding this comment.
Already removed in the RC core.
| @@ -0,0 +1,190 @@ | |||
| { | |||
There was a problem hiding this comment.
Already removed in the RC core.
| @@ -0,0 +1,11 @@ | |||
| // import { TAPi18n } from 'meteor/tap:i18n'; | |||
geekgonecrazy
changed the title
| @@ -117,6 +117,11 @@ | |||
| align-items: center; | |||
| } | |||
|
|
|||
| /* support additional headers within a page */ | |||
app/ui/client/views/app/room.js
Outdated
| @@ -853,6 +853,52 @@ Template.room.events({ | |||
| } | |||
| }, | |||
|
|
|||
| 'click .recognized-term'(e) { | |||
There was a problem hiding this comment.
Code relevant for Assistify.
| @@ -1,6 +1,7 @@ | |||
| .loading-animation { | |||
| color: @secondary-font-color; | |||
| font-size: 1.3rem; | |||
| line-height: 1.6rem; | |||
There was a problem hiding this comment.
Relevant only to Assistify.
app/api/server/v1/users.js
Outdated
| @@ -685,3 +685,13 @@ API.v1.addRoute('users.requestDataDownload', { authRequired: true }, { | |||
| }); | |||
| }, | |||
| }); | |||
|
|
|||
| @@ -0,0 +1,2 @@ | |||
| import './defaultLanguage.js'; | |||
There was a problem hiding this comment.
No PR. This belongs to Assistify configuration package.
| @@ -71,7 +71,7 @@ export const AutoTranslate = { | |||
| Tracker.autorun(() => { | |||
| Subscriptions.find().observeChanges({ | |||
| changed: (id, fields) => { | |||
| if (fields.hasOwnProperty('autoTranslate')) { | |||
| if (fields.hasOwnProperty('autoTranslate') || fields.hasOwnProperty('autoTranslateLanguage')) { | |||
| @@ -99,7 +99,7 @@ Template.autoTranslateFlexTab.onCreated(function() { | |||
| this.saveSetting = () => { | |||
| const field = this.editing.get(); | |||
| const subscription = Subscriptions.findOne({ rid: this.rid, 'u._id': Meteor.userId() }); | |||
| const previousLanguage = subscription.autoTranslateLanguage; | |||
| const previousLanguage = subscription && subscription.autoTranslateLanguage; | |||
app/autotranslate/server/index.js
Outdated
| @@ -13,6 +13,7 @@ import './methods/saveSettings'; | |||
| import './methods/translateMessage'; | |||
| import './googleTranslate.js'; | |||
| import './deeplTranslate.js'; | |||
| import './msTranslate.js'; | |||
| @@ -0,0 +1,174 @@ | |||
| /** | |||
app/ui-message/client/message.html
Outdated
| @@ -44,6 +44,7 @@ | |||
| {{#if showTranslated}} | |||
| <span class="translated"> | |||
| <i class="icon-language {{#if msg.autoTranslateFetching}}loading{{/if}}" aria-label="{{_ "Translated"}}"></i> | |||
| <span class="translation-provider">{{ translationProvider }}</span> | |||
app/ui-message/client/message.js
Outdated
| @@ -17,6 +17,7 @@ import { upsertMessage } from '../../ui-utils/client/lib/RoomHistoryManager'; | |||
| import { messageArgs } from '../../ui-utils/client/lib/messageArgs'; | |||
| import './message.html'; | |||
| import './messageThread.html'; | |||
| import { AutoTranslate } from '../../autotranslate/client'; | |||
app/ui-message/client/message.js
Outdated
| @@ -259,6 +260,11 @@ Template.message.helpers({ | |||
| return msg.autoTranslateFetching || (!!autoTranslate !== !!msg.autoTranslateShowInverse && msg.translations && msg.translations[settings.translateLanguage]); | |||
| } | |||
| }, | |||
| translationProvider() { | |||
app/ui-message/client/message.html
Outdated
| @@ -44,6 +44,7 @@ | |||
| {{#if showTranslated}} | |||
| <span class="translated"> | |||
| <i class="icon-language {{#if msg.autoTranslateFetching}}loading{{/if}}" aria-label="{{_ "Translated"}}"></i> | |||
| <span class="translation-provider">{{ translationProvider }}</span> | |||
app/api/server/v1/users.js
Outdated
| @@ -691,6 +691,16 @@ API.v1.addRoute('users.requestDataDownload', { authRequired: true }, { | |||
| }, | |||
| }); | |||
|
|
|||
| API.v1.addRoute('users.logoutOtherClients', { authRequired: true }, { | |||
|
|
||
| .smarti #widgetContainer #widgetWrapper #widgetFooter button { | ||
|
|
||
| position: relative; |
There was a problem hiding this comment.
|
|
||
| .smarti #widgetContainer #widgetWrapper #widgetHeader h4 { | ||
|
|
||
| margin-top: -10px; |
There was a problem hiding this comment.
|
@mrsimpson can you update this PR? |
|
@rodrigok this PR is just a technical vehicle to keep track of our custom image. Can you tag this to be ignored so it doesn't show up in your "open community PRs list"? |
jschirrmacher
force-pushed
the
develop
branch
from
21968f1 to
071d72e
Compare
This PR serves as container for documenting differences between plain Rocket.Chat and the Assistify fork.
Aim is to change Assistify in such a way that this Diff is getting reduced more and more
Human readable List of changes discovered
users.logoutOtherClientto logout from other locations #16193