tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "add last files (#1110)" (#1114) 

This reverts commit 950439bf47.
This commit is contained in:
Guillermo Giuliana 2021-12-13 16:32:53 -03:00 committed by GitHub
parent 950439bf47
commit 237801e9ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 75 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/app-components/article-add-modal.js
View File

@ -12,7 +12,6 @@ import FormField from 'core-components/form-field';
import SubmitButton from 'core-components/submit-button'; import SubmitButton from 'core-components/submit-button';
import Button from 'core-components/button'; import Button from 'core-components/button';
import TextEditor from 'core-components/text-editor'; import TextEditor from 'core-components/text-editor';
import Message from 'core-components/message';
class ArticleAddModal extends React.Component { class ArticleAddModal extends React.Component {
static propTypes = { static propTypes = {
@ -23,8 +22,7 @@ class ArticleAddModal extends React.Component {
}; };
state = { state = {
loading: false, loading: false
errorMessage: false
}; };
render() { render() {
@ -33,7 +31,6 @@ class ArticleAddModal extends React.Component {
<Header title={i18n('ADD_ARTICLE')} description={i18n('ADD_ARTICLE_DESCRIPTION', {category: this.props.topicName})} /> <Header title={i18n('ADD_ARTICLE')} description={i18n('ADD_ARTICLE_DESCRIPTION', {category: this.props.topicName})} />
<Form onSubmit={this.onAddNewArticleFormSubmit.bind(this)} loading={this.state.loading}> <Form onSubmit={this.onAddNewArticleFormSubmit.bind(this)} loading={this.state.loading}>
<FormField name="title" label={i18n('TITLE')} field="input" fieldProps={{size: 'large'}} validation="TITLE" required/> <FormField name="title" label={i18n('TITLE')} field="input" fieldProps={{size: 'large'}} validation="TITLE" required/>
{this.state.errorMessage ? <Message type="error">{i18n(this.state.errorMessage)}</Message> : null}
<FormField name="content" label={i18n('CONTENT')} field="textarea" validation="TEXT_AREA" required fieldProps={{allowImages: this.props.allowAttachments}}/> <FormField name="content" label={i18n('CONTENT')} field="textarea" validation="TEXT_AREA" required fieldProps={{allowImages: this.props.allowAttachments}}/>
<Button className="article-add-modal__cancel-button" type="link" onClick={(event) => { <Button className="article-add-modal__cancel-button" type="link" onClick={(event) => {
event.preventDefault(); event.preventDefault();
@ -60,16 +57,13 @@ class ArticleAddModal extends React.Component {
}) })
}).then(() => { }).then(() => {
ModalContainer.closeModal(); ModalContainer.closeModal();
this.setState({
errorMessage: false
});
if(this.props.onChange) { if(this.props.onChange) {
this.props.onChange(); this.props.onChange();
} }
}).catch((e) => { }).catch(() => {
this.setState({ this.setState({
loading: false, loading: false
errorMessage: e.message
}); });
}); });
} }

15
client/src/app-components/topic-edit-modal.js
View File

@ -11,7 +11,6 @@ import SubmitButton from 'core-components/submit-button';
import IconSelector from 'core-components/icon-selector'; import IconSelector from 'core-components/icon-selector';
import ColorSelector from 'core-components/color-selector'; import ColorSelector from 'core-components/color-selector';
import InfoTooltip from 'core-components/info-tooltip'; import InfoTooltip from 'core-components/info-tooltip';
import Message from 'core-components/message';
class TopicEditModal extends React.Component { class TopicEditModal extends React.Component {
@ -27,17 +26,14 @@ class TopicEditModal extends React.Component {
state = { state = {
values: this.props.defaultValues || {title: '', icon: 'address-card', color: '#ff6900', private: false}, values: this.props.defaultValues || {title: '', icon: 'address-card', color: '#ff6900', private: false},
loading: false, loading: false
errorMessage: false
}; };
render() { render() {
if (this.state.errorMessage ) console.log(this.state.errorMessage)
return ( return (
<div className="topic-edit-modal"> <div className="topic-edit-modal">
<Header title={i18n((this.props.addForm) ? 'ADD_TOPIC' : 'EDIT_TOPIC')} description={i18n((this.props.addForm) ? 'ADD_TOPIC_DESCRIPTION' : 'EDIT_TOPIC_DESCRIPTION')} /> <Header title={i18n((this.props.addForm) ? 'ADD_TOPIC' : 'EDIT_TOPIC')} description={i18n((this.props.addForm) ? 'ADD_TOPIC_DESCRIPTION' : 'EDIT_TOPIC_DESCRIPTION')} />
<Form values={this.state.values} onChange={this.onFormChange.bind(this)} onSubmit={this.onSubmit.bind(this)} loading={this.state.loading}> <Form values={this.state.values} onChange={this.onFormChange.bind(this)} onSubmit={this.onSubmit.bind(this)} loading={this.state.loading}>
{this.state.errorMessage ? <Message type="error">{i18n(this.state.errorMessage)}</Message> : null}
<FormField name="title" label={i18n('TITLE')} fieldProps={{size: 'large'}} validation="TITLE" required /> <FormField name="title" label={i18n('TITLE')} fieldProps={{size: 'large'}} validation="TITLE" required />
<FormField name="icon" className="topic-edit-modal__icon" label={i18n('ICON')} decorator={IconSelector} /> <FormField name="icon" className="topic-edit-modal__icon" label={i18n('ICON')} decorator={IconSelector} />
<FormField name="color" className="topic-edit-modal__color" label={i18n('COLOR')} decorator={ColorSelector} /> <FormField name="color" className="topic-edit-modal__color" label={i18n('COLOR')} decorator={ColorSelector} />
@ -72,16 +68,13 @@ class TopicEditModal extends React.Component {
} }
}).then(() => { }).then(() => {
this.context.closeModal(); this.context.closeModal();
this.setState({
errorMessage: false
});
if(this.props.onChange) { if(this.props.onChange) {
this.props.onChange(); this.props.onChange();
} }
}).catch((e) => { }).catch(() => {
this.setState({ this.setState({
loading: false, loading: false
errorMessage: e.message
}); });
}); });
} }

13
client/src/app/admin/panel/articles/admin-panel-view-article.js
View File

@ -18,7 +18,6 @@ import Form from 'core-components/form';
import FormField from 'core-components/form-field'; import FormField from 'core-components/form-field';
import SubmitButton from 'core-components/submit-button'; import SubmitButton from 'core-components/submit-button';
import TextEditor from 'core-components/text-editor'; import TextEditor from 'core-components/text-editor';
import Message from 'core-components/message';
class AdminPanelViewArticle extends React.Component { class AdminPanelViewArticle extends React.Component {
@ -34,8 +33,7 @@ class AdminPanelViewArticle extends React.Component {
}; };
state = { state = {
editable: false, editable: false
errorMessage: false
}; };
componentDidMount() { componentDidMount() {
@ -47,7 +45,6 @@ class AdminPanelViewArticle extends React.Component {
} }
render() { render() {
console.log(this.state.errorMessage)
return ( return (
<div className="admin-panel-view-article"> <div className="admin-panel-view-article">
{(this.props.loading) ? <Loading /> : this.renderContent()} {(this.props.loading) ? <Loading /> : this.renderContent()}
@ -99,7 +96,6 @@ class AdminPanelViewArticle extends React.Component {
</Button> </Button>
<SubmitButton className="admin-panel-view-article__button" type="secondary" size="medium">{i18n('SAVE')}</SubmitButton> <SubmitButton className="admin-panel-view-article__button" type="secondary" size="medium">{i18n('SAVE')}</SubmitButton>
</div> </div>
{this.state.errorMessage ? <Message type="error">{i18n(this.state.errorMessage)}</Message> : null}
<FormField name="title" label={i18n('TITLE')} /> <FormField name="title" label={i18n('TITLE')} />
<FormField name="content" label={i18n('CONTENT')} field="textarea" validation="TEXT_AREA" required fieldProps={{allowImages: this.props.allowAttachments}}/> <FormField name="content" label={i18n('CONTENT')} field="textarea" validation="TEXT_AREA" required fieldProps={{allowImages: this.props.allowAttachments}}/>
</Form> </Form>
@ -143,12 +139,7 @@ class AdminPanelViewArticle extends React.Component {
}).then(() => { }).then(() => {
this.props.dispatch(ArticlesActions.retrieveArticles()); this.props.dispatch(ArticlesActions.retrieveArticles());
this.setState({ this.setState({
editable: false, editable: false
errorMessage: false
})
}).catch((e) => {
this.setState({
errorMessage: e.message
}); });
}); });
} }

2
client/src/data/languages/en.js
View File

@ -410,8 +410,6 @@ export default {
'INVALID_SUPERVISED_USERS': 'Invalid supervised users', 'INVALID_SUPERVISED_USERS': 'Invalid supervised users',
'SUPERVISOR_CAN_NOT_SUPERVISE_HIMSELF': 'Supervisor can not supervise himself', 'SUPERVISOR_CAN_NOT_SUPERVISE_HIMSELF': 'Supervisor can not supervise himself',
'NAME_ALREADY_USED': 'Name already used', 'NAME_ALREADY_USED': 'Name already used',
'CONTENT_ALREADY_USED': 'Content already used',
'TITLE_ALREADY_USED': 'Title already used',
//MESSAGES //MESSAGES
'SIGNUP_SUCCESS': 'You have registered successfully in our support system.', 'SIGNUP_SUCCESS': 'You have registered successfully in our support system.',

28
server/controllers/article/add-topic.php
View File

@ -19,10 +19,9 @@ DataValidator::with('CustomValidations', true);
* @apiParam {String} iconColor Icon's color of the new topic. * @apiParam {String} iconColor Icon's color of the new topic.
* @apiParam {Boolean} private Indicates if the topic is not shown to users. * @apiParam {Boolean} private Indicates if the topic is not shown to users.
* *
* @apiUse NO_PERMISSION * @apiUse NO_PERMISSION
* @apiUse INVALID_TITLE * @apiUse INVALID_NAME
* @apiUse NAME_ALREADY_USED *
*
* @apiSuccess {Object} data Topic info * @apiSuccess {Object} data Topic info
* @apiSuccess {Number} data.topicId Topic id * @apiSuccess {Number} data.topicId Topic id
* *
@ -38,30 +37,19 @@ class AddTopicController extends Controller {
'requestData' => [ 'requestData' => [
'name' => [ 'name' => [
'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME), 'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME),
'error' => ERRORS::INVALID_TITLE 'error' => ERRORS::INVALID_NAME
], ],
] ]
]; ];
} }
public function handler() { public function handler() {
$name = Controller::request('name', true);
$icon = Controller::request('icon');
$iconColor = Controller::request('iconColor');
$private = Controller::request('private') ? 1 : 0;
$CreatedTopic = Topic::getDataStore($name, 'name');
if(!$CreatedTopic->isNull()){
throw new RequestException(ERRORS::NAME_ALREADY_USED);
}
$topic = new Topic(); $topic = new Topic();
$topic->setProperties([ $topic->setProperties([
'name' => $name, 'name' => Controller::request('name', true),
'icon' => $icon, 'icon' => Controller::request('icon'),
'iconColor' => $iconColor, 'iconColor' => Controller::request('iconColor'),
'private' => $private 'private' => Controller::request('private') ? 1 : 0
]); ]);
Log::createLog('ADD_TOPIC', $topic->name); Log::createLog('ADD_TOPIC', $topic->name);

18
server/controllers/article/add.php
View File

@ -25,8 +25,6 @@ DataValidator::with('CustomValidations', true);
* @apiUse INVALID_TITLE * @apiUse INVALID_TITLE
* @apiUse INVALID_CONTENT * @apiUse INVALID_CONTENT
* @apiUse INVALID_TOPIC * @apiUse INVALID_TOPIC
* @apiUse TITLE_ALREADY_USED
* @apiUse CONTENT_ALREADY_USED
* *
* @apiSuccess {Object} data Article info * @apiSuccess {Object} data Article info
* @apiSuccess {Number} data.articleId Article id * @apiSuccess {Number} data.articleId Article id
@ -41,7 +39,7 @@ class AddArticleController extends Controller {
'permission' => 'staff_2', 'permission' => 'staff_2',
'requestData' => [ 'requestData' => [
'title' => [ 'title' => [
'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME), 'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_TITLE, LengthConfig::MAX_LENGTH_TITLE),
'error' => ERRORS::INVALID_TITLE 'error' => ERRORS::INVALID_TITLE
], ],
'content' => [ 'content' => [
@ -58,26 +56,14 @@ class AddArticleController extends Controller {
public function handler() { public function handler() {
$content = Controller::request('content', true); $content = Controller::request('content', true);
$title = Controller::request('title', true);
$createdArticleTookByTitle = Article::getDataStore($title,'title');
$createdArticleTookByContent = Article::getDataStore($content,'content');
if(!$createdArticleTookByTitle->isNull()){
throw new RequestException(ERRORS::TITLE_ALREADY_USED);
}
if(!$createdArticleTookByContent->isNull()){
throw new RequestException(ERRORS::CONTENT_ALREADY_USED);
}
$fileUploader = FileUploader::getInstance(); $fileUploader = FileUploader::getInstance();
$fileUploader->setPermission(FileManager::PERMISSION_ARTICLE); $fileUploader->setPermission(FileManager::PERMISSION_ARTICLE);
$imagePaths = $this->uploadImages(true); $imagePaths = $this->uploadImages(true);
$article = new Article(); $article = new Article();
$article->setProperties([ $article->setProperties([
'title' => $title, 'title' => Controller::request('title', true),
'content' => $this->replaceWithImagePaths($imagePaths, $content), 'content' => $this->replaceWithImagePaths($imagePaths, $content),
'lastEdited' => Date::getCurrentDate(), 'lastEdited' => Date::getCurrentDate(),
'position' => Controller::request('position') || 1 'position' => Controller::request('position') || 1

28
server/controllers/article/edit-topic.php
View File

@ -22,8 +22,7 @@ DataValidator::with('CustomValidations', true);
* *
* @apiUse NO_PERMISSION * @apiUse NO_PERMISSION
* @apiUse INVALID_TOPIC * @apiUse INVALID_TOPIC
* @apiUse INVALID_TITLE * @apiUse INVALID_NAME
* @apiUse NAME_ALREADY_USED
* *
* @apiSuccess {Object} data Empty object * @apiSuccess {Object} data Empty object
* *
@ -43,7 +42,7 @@ class EditTopicController extends Controller {
], ],
'name' => [ 'name' => [
'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME), 'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME),
'error' => ERRORS::INVALID_TITLE 'error' => ERRORS::INVALID_NAME
] ]
] ]
]; ];
@ -51,29 +50,20 @@ class EditTopicController extends Controller {
public function handler() { public function handler() {
$topic = Topic::getDataStore(Controller::request('topicId')); $topic = Topic::getDataStore(Controller::request('topicId'));
$name = Controller::request('name');
$iconColor = Controller::request('iconColor');
$private = Controller::request('private');
$icon = Controller::request('icon');
$createdArticleTookByName = Topic::getDataStore($name, 'name');
if(!$createdArticleTookByName->isNull() && $topic->id !== $createdArticleTookByName->id){ if(Controller::request('name')) {
throw new RequestException(ERRORS::NAME_ALREADY_USED);
}
if($name) {
$topic->name = Controller::request('name', true); $topic->name = Controller::request('name', true);
} }
if($iconColor) { if(Controller::request('iconColor')) {
$topic->iconColor = $iconColor; $topic->iconColor = Controller::request('iconColor');
} }
if($icon) { if(Controller::request('icon')) {
$topic->icon = $icon; $topic->icon = Controller::request('icon');
} }
if ($private !== null) { if (Controller::request('private') !== null) {
$topic->private = $private; $topic->private = Controller::request('private');
} }
$topic->store(); $topic->store();

42
server/controllers/article/edit.php
View File

@ -26,9 +26,7 @@ DataValidator::with('CustomValidations', true);
* @apiUse INVALID_TOPIC * @apiUse INVALID_TOPIC
* @apiUse INVALID_FILE * @apiUse INVALID_FILE
* @apiUse INVALID_TITLE * @apiUse INVALID_TITLE
* @apiUse CONTENT_ALREADY_USED *
* @apiUse TITLE_ALREADY_USED
*
* @apiSuccess {Object} data Empty object * @apiSuccess {Object} data Empty object
* *
*/ */
@ -46,17 +44,14 @@ class EditArticleController extends Controller {
'error' => ERRORS::INVALID_TOPIC 'error' => ERRORS::INVALID_TOPIC
], ],
'title' => [ 'title' => [
'validation' => DataValidator::OneOf( 'validation' => DataValidator::oneOf(
DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME), DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_TITLE, LengthConfig::MAX_LENGTH_TITLE),
DataValidator::nullType() DataValidator::nullType()
), ),
'error' => ERRORS::INVALID_TITLE 'error' => ERRORS::INVALID_TITLE
], ],
'content' => [ 'content' => [
'validation' => DataValidator::oneOf( 'validation' => DataValidator::oneOf(DataValidator::content(),DataValidator::nullType()),
DataValidator::content(),
DataValidator::nullType()
),
'error' => ERRORS::INVALID_CONTENT 'error' => ERRORS::INVALID_CONTENT
] ]
] ]
@ -64,24 +59,10 @@ class EditArticleController extends Controller {
} }
public function handler() { public function handler() {
$topicId = Controller::request('topicId');
$content = Controller::request('content', true);
$title = Controller::request('title');
$article = Article::getDataStore(Controller::request('articleId')); $article = Article::getDataStore(Controller::request('articleId'));
$createdArticleTookByTitle = Article::getDataStore($title, 'title');
$createdArticleTookByContent = Article::getDataStore($content, 'content');
if(!$createdArticleTookByTitle->isNull() && $article->title !== $createdArticleTookByTitle->title){ if (Controller::request('topicId')) {
throw new RequestException(ERRORS::TITLE_ALREADY_USED); $newArticleTopic = Topic::getDataStore(Controller::request('topicId'));
}
if(!$createdArticleTookByContent->isNull() && $article->content !== $createdArticleTookByContent->content){
throw new RequestException(ERRORS::CONTENT_ALREADY_USED);
}
if ($topicId) {
$newArticleTopic = Topic::getDataStore($topicId);
if (!$newArticleTopic->isNull()) { if (!$newArticleTopic->isNull()) {
$article->topic = $newArticleTopic; $article->topic = $newArticleTopic;
@ -91,17 +72,18 @@ class EditArticleController extends Controller {
} }
} }
if($content) { if(Controller::request('content')) {
$fileUploader = FileUploader::getInstance(); $fileUploader = FileUploader::getInstance();
$fileUploader->setPermission(FileManager::PERMISSION_ARTICLE); $fileUploader->setPermission(FileManager::PERMISSION_ARTICLE);
$content = Controller::request('content', true);
$imagePaths = $this->uploadImages(true); $imagePaths = $this->uploadImages(true);
$article->content = $this->replaceWithImagePaths($imagePaths, $content); $article->content = $this->replaceWithImagePaths($imagePaths, $content);
} }
if($title) { if(Controller::request('title')) {
$article->title = $title; $article->title = Controller::request('title');
} }
if(Controller::request('position')) { if(Controller::request('position')) {

11
server/controllers/system/edit-department.php
View File

@ -21,7 +21,6 @@ DataValidator::with('CustomValidations', true);
* @apiUse NO_PERMISSION * @apiUse NO_PERMISSION
* @apiUse INVALID_NAME * @apiUse INVALID_NAME
* @apiUse INVALID_DEPARTMENT * @apiUse INVALID_DEPARTMENT
* @apiUse NAME_ALREADY_USED
* *
* @apiSuccess {Object} data Empty object * @apiSuccess {Object} data Empty object
* *
@ -40,7 +39,10 @@ class EditDepartmentController extends Controller {
'error' => ERRORS::INVALID_DEPARTMENT 'error' => ERRORS::INVALID_DEPARTMENT
], ],
'name' => [ 'name' => [
'validation' => DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME), 'validation' => DataValidator::AllOf(
DataValidator::notBlank()->length(LengthConfig::MIN_LENGTH_NAME, LengthConfig::MAX_LENGTH_NAME),
DataValidator::ValidDepartmentName()
),
'error' => ERRORS::INVALID_NAME 'error' => ERRORS::INVALID_NAME
], ],
] ]
@ -53,11 +55,6 @@ class EditDepartmentController extends Controller {
$private = Controller::request('private'); $private = Controller::request('private');
$departmentInstance = Department::getDataStore($departmentId); $departmentInstance = Department::getDataStore($departmentId);
$createdDepartment = Department::getDataStore($newName, 'name');
if(!$createdDepartment->isNull() && $createdDepartment->name !== $departmentInstance->name){
throw new RequestException(ERRORS::NAME_ALREADY_USED);
}
if($private && $departmentId == Setting::getSetting('default-department-id')->getValue()){ if($private && $departmentId == Setting::getSetting('default-department-id')->getValue()){
throw new RequestException(ERRORS::DEFAULT_DEPARTMENT_CAN_NOT_BE_PRIVATE); throw new RequestException(ERRORS::DEFAULT_DEPARTMENT_CAN_NOT_BE_PRIVATE);

12
server/data/ERRORS.php
View File

@ -24,17 +24,9 @@
* @apiError {String} INVALID_TITLE The title is invalid, probably too short. * @apiError {String} INVALID_TITLE The title is invalid, probably too short.
*/ */
/** /**
* @apiDefine TITLE_ALREADY_USED * @apiDefine INVALID_CONTENT
* @apiError {String} TITLE_ALREADY_USED The title is already in use.
*/
/**
* @apiDefine INVALID_CONTENT
* @apiError {String} INVALID_CONTENT The content is invalid, probably to short. * @apiError {String} INVALID_CONTENT The content is invalid, probably to short.
*/ */
/**
* @apiDefine CONTENT_ALREADY_USED
* @apiError {String} CONTENT_ALREADY_USED The content is already in use.
*/
/** /**
* @apiDefine INVALID_EMAIL * @apiDefine INVALID_EMAIL
* @apiError {String} INVALID_EMAIL The email is invalid or already exists. * @apiError {String} INVALID_EMAIL The email is invalid or already exists.
@ -343,9 +335,7 @@ class ERRORS {
const TAG_EXISTS = 'TAG_EXISTS'; const TAG_EXISTS = 'TAG_EXISTS';
const NO_PERMISSION = 'NO_PERMISSION'; const NO_PERMISSION = 'NO_PERMISSION';
const INVALID_TITLE = 'INVALID_TITLE'; const INVALID_TITLE = 'INVALID_TITLE';
const TITLE_ALREADY_USED = 'TITLE_ALREADY_USED';
const INVALID_CONTENT = 'INVALID_CONTENT'; const INVALID_CONTENT = 'INVALID_CONTENT';
const CONTENT_ALREADY_USED = 'CONTENT_ALREADY_USED';
const INVALID_EMAIL = 'INVALID_EMAIL'; const INVALID_EMAIL = 'INVALID_EMAIL';
const INVALID_PASSWORD = 'INVALID_PASSWORD'; const INVALID_PASSWORD = 'INVALID_PASSWORD';
const INVALID_NAME = 'INVALID_NAME'; const INVALID_NAME = 'INVALID_NAME';

13
server/libs/validations/validArticleContent.php
View File

@ -1,13 +0,0 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class ValidArticleContent extends AbstractRule {
public function validate($content) {
$article = \Article::getDataStore($content, 'content');
return $article->isNull();
}
}

13
server/libs/validations/validArticleName.php
View File

@ -1,13 +0,0 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class ValidArticleName extends AbstractRule {
public function validate($name) {
$article = \Article::getDataStore($name, 'title');
return $article->isNull();
}
}

13
server/libs/validations/validTopicName.php
View File

@ -1,13 +0,0 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class ValidTopicName extends AbstractRule {
public function validate($name) {
$topic = \Topic::getDataStore($name, 'name');
return $topic->isNull();
}
}

147
tests/article/article.rb
View File

@ -48,32 +48,6 @@ describe 'Article path' do
(lastLog['type']).should.equal('ADD_ARTICLE') (lastLog['type']).should.equal('ADD_ARTICLE')
end end
it 'should fail if articles data already exists' do
result = request('/article/add', {
title: 'Some article',
content: 'this content is unique',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('fail')
(result['message']).should.equal('TITLE_ALREADY_USED')
result = request('/article/add', {
title: 'unique title',
content: 'This is an article about server management.',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('fail')
(result['message']).should.equal('CONTENT_ALREADY_USED')
end
it 'should edit article' do it 'should edit article' do
result = request('/article/edit', { result = request('/article/edit', {
articleId: @article_id, articleId: @article_id,
@ -93,77 +67,6 @@ describe 'Article path' do
(lastLog['type']).should.equal('EDIT_ARTICLE') (lastLog['type']).should.equal('EDIT_ARTICLE')
end end
it 'should fail if edit article has already used data' do
result = request('/article/add', {
title: 'unique title1.5',
content: 'This is an article about server management1.5.',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
result = request('/article/add', {
title: 'unique title2',
content: 'This is an article about server management22.',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
lastArticle = $database.getLastRow('article')
result = request('/article/edit', {
articleId: lastArticle['id'],
content: 'This is an article about server management1.5.',
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('fail')
(result['message']).should.equal('CONTENT_ALREADY_USED')
result = request('/article/edit', {
articleId: lastArticle['id'],
title: 'unique title1.5',
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('fail')
(result['message']).should.equal('TITLE_ALREADY_USED')
end
it 'should success if change for the same date' do
result = request('/article/add', {
title: 'unique article',
content: 'this content is unique pt2',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
lastArticle = $database.getLastRow('article')
result = request('/article/edit', {
articleId: lastArticle['id'],
title: 'unique article',
content: 'this content is unique pt2',
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
end
it 'should edit article topic' do it 'should edit article topic' do
request('/article/add-topic', { request('/article/add-topic', {
name: 'Software installation', name: 'Software installation',
@ -204,44 +107,38 @@ describe 'Article path' do
end end
it 'should retrieve all articles' do it 'should retrieve all articles' do
request('/article/add', {
title: 'Some article',
content: 'This is an article about server management.',
topicId: @topic_id,
position: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
result = request('/article/get-all', { result = request('/article/get-all', {
csrf_userid: $csrf_userid, csrf_userid: $csrf_userid,
csrf_token: $csrf_token csrf_token: $csrf_token
}) })
(result['status']).should.equal('success') (result['status']).should.equal('success')
(result['data'][0]['name']).should.equal('Valid name') (result['data'][0]['name']).should.equal('Server management')
(result['data'][0]['icon']).should.equal('flag') (result['data'][0]['icon']).should.equal('cogs')
(result['data'][0]['iconColor']).should.equal('pink') (result['data'][0]['iconColor']).should.equal('red')
(result['data'][0]['private']).should.equal('1') (result['data'][0]['private']).should.equal('0')
(result['data'][1]['name']).should.equal('Private Topic')
(result['data'][1]['name']).should.equal('Server management')
(result['data'][1]['icon']).should.equal('cogs') (result['data'][1]['icon']).should.equal('cogs')
(result['data'][1]['iconColor']).should.equal('red') (result['data'][1]['iconColor']).should.equal('green')
(result['data'][1]['private']).should.equal('0') (result['data'][1]['private']).should.equal('1')
(result['data'][2]['name']).should.equal('Software installation')
(result['data'][2]['icon']).should.equal('photo')
(result['data'][2]['iconColor']).should.equal('blue')
(result['data'][2]['private']).should.equal('0')
(result['data'][2]['name']).should.equal('Private Topic') (result['data'][0]['articles'][0]['title']).should.equal('Some article')
(result['data'][2]['icon']).should.equal('cogs') (result['data'][0]['articles'][0]['content']).should.equal('This is an article about server management.')
(result['data'][2]['iconColor']).should.equal('green') (result['data'][0]['articles'][0]['position']).should.equal('1')
(result['data'][2]['private']).should.equal('1')
(result['data'][3]['name']).should.equal('Software installation')
(result['data'][3]['icon']).should.equal('photo')
(result['data'][3]['iconColor']).should.equal('blue')
(result['data'][3]['private']).should.equal('0')
(result['data'][1]['articles'][0]['title']).should.equal('unique title1.5')
(result['data'][1]['articles'][0]['content']).should.equal('This is an article about server management1.5.')
(result['data'][1]['articles'][0]['position']).should.equal('1')
(result['data'][1]['articles'][1]['title']).should.equal('unique title2')
(result['data'][1]['articles'][1]['content']).should.equal('This is an article about server management22.')
(result['data'][1]['articles'][1]['position']).should.equal('1')
(result['data'][1]['articles'][2]['title']).should.equal('unique article')
(result['data'][1]['articles'][2]['content']).should.equal('this content is unique pt2')
(result['data'][1]['articles'][2]['position']).should.equal('1')
end end
it 'should retrieve public departments' do it 'should retrieve public departments' do
Scripts.logout() Scripts.logout()
Scripts.login('tyrion@opensupports.com', 'tyrionl') Scripts.login('tyrion@opensupports.com', 'tyrionl')

54
tests/article/topic.rb
View File

@ -24,19 +24,6 @@ describe 'Topic paths' do
(lastLog['type']).should.equal('ADD_TOPIC') (lastLog['type']).should.equal('ADD_TOPIC')
end end
it 'should success if topic has same name' do
result = request('/article/edit-topic', {
topicId: 1,
name: 'Server management',
iconColor: 'blue',
private: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
end
it 'should edit topic correctly' do it 'should edit topic correctly' do
result = request('/article/edit-topic', { result = request('/article/edit-topic', {
topicId: 1, topicId: 1,
@ -56,47 +43,6 @@ describe 'Topic paths' do
(topic['private']).should.equal(1) (topic['private']).should.equal(1)
end end
it 'should fail if data is already in use' do
result = request('/article/add-topic', {
name: 'Installation issues',
icon: 'cogs',
iconColor: 'red',
private: 0,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('fail')
(result['message']).should.equal('NAME_ALREADY_USED')
end
it 'should edit topic if data is right without name' do
result = request('/article/add-topic', {
name: 'Valid name',
icon: 'cogs',
iconColor: 'red',
private: 0,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
topic = $database.getLastRow('topic')
result = request('/article/edit-topic', {
name: 'Valid name',
topicId: topic['id'],
iconColor: 'pink',
icon: 'flag',
private: 1,
csrf_userid: $csrf_userid,
csrf_token: $csrf_token
})
(result['status']).should.equal('success')
end
it 'should delete topic correctly' do it 'should delete topic correctly' do
result = request('/article/delete-topic', { result = request('/article/delete-topic', {
topicId: 1, topicId: 1,

5
tests/scripts.rb
View File

@ -162,12 +162,11 @@ class Scripts
}) })
end end
def self.createDepartment(nameDepartment, private = 0) def self.createDepartment(nameDepartment = 'validnameDepartment')
request('/system/add-department', { request('/system/add-department', {
csrf_userid: $csrf_userid, csrf_userid: $csrf_userid,
csrf_token: $csrf_token, csrf_token: $csrf_token,
name: nameDepartment, name: nameDepartment
private: private
}) })
end end

30
tests/system/edit-department.rb
View File

@ -44,39 +44,19 @@ describe'system/edit-department' do
result['status'].should.equal('fail') result['status'].should.equal('fail')
result['message'].should.equal('INVALID_NAME') result['message'].should.equal('INVALID_NAME')
end
it 'should success if you change for the same name' do
Scripts.createDepartment('thisisAnewName')
department = $database.getLastRow('department')
result = request('/system/edit-department', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
name: department['name'],
departmentId: department['id'],
private:1
})
result['status'].should.equal('success')
end
it 'shouild fail if you use an used name' do
Scripts.createDepartment('thistitleisunique')
lastDepartment = $database.getLastRow('department') lastDepartment = $database.getLastRow('department')
result = request('/system/edit-department', { result = request('/system/edit-department', {
csrf_userid: $csrf_userid, csrf_userid: $csrf_userid,
csrf_token: $csrf_token, csrf_token: $csrf_token,
name: 'thisisAnewName', name: lastDepartment['name'],
departmentId: lastDepartment['id'], departmentId: 4
private:1
}) })
result['status'].should.equal('fail') result['status'].should.equal('fail')
result['message'].should.equal('NAME_ALREADY_USED') result['message'].should.equal('INVALID_NAME')
end end
end end