-
Notifications
You must be signed in to change notification settings - Fork 137
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
Tools module functionality #2951
Open
alex-odysseus
wants to merge
15
commits into
master
Choose a base branch
from
tools-module
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
5a36241
tools atl-9
d4d452b
tool atl-9 update edit icon & logic when click block card
f3bc49a
tool atl-9 clear form add tool when completed add tool or cancel form
b4a6c38
tool atl-9 update multi language for loading text at tools screen
f98e4a0
tool atl-9 handle catch error when get tools & re-style classname
c0587b3
add shadow to tool card when hover & validate add new tool form
4cdff7d
check roles in the tool screen
jcnamendiOdysseus 58e17f6
Change createdDate, updatedDate data type date to data type timestamp
jcnamendiOdysseus 87304b2
update role functions in the tool screen
jcnamendiOdysseus 0021628
Show text when the author is not present
jcnamendiOdysseus 41e4cef
fix update tools data property
jcnamendiOdysseus f4260fe
Displays an icon indicating enabled/disabled
jcnamendiOdysseus 9ad8d93
Display status card tool by text for admin
jcnamendiOdysseus cef5a30
-Add label to View card showing toggle icon enabled/disabled
jcnamendiOdysseus ae3ad9e
Merge remote-tracking branch 'remotes/origin/atl-9-tools'
alex-odysseus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| define([ | ||
| 'services/AuthAPI', | ||
| ], function ( | ||
| AuthAPI, | ||
| ) { | ||
| return class PermissionService { | ||
|
|
||
| static isPermittedReadTools() { | ||
| return AuthAPI.isPermitted('tool:get'); | ||
| } | ||
|
|
||
| static isPermittedCreateTool() { | ||
| return AuthAPI.isPermitted('tool:post'); | ||
| } | ||
|
|
||
| static isPermittedUpdateTool() { | ||
| return AuthAPI.isPermitted('tool:put'); | ||
| } | ||
|
|
||
| static isPermittedDeleteTool() { | ||
| return AuthAPI.isPermitted('tool:*:delete'); | ||
| } | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| define( | ||
| (require, exports) => { | ||
| const pageTitle = 'Tools'; | ||
|
|
||
| return { | ||
| pageTitle, | ||
| }; | ||
| } | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| define( | ||
| (require, exports) => { | ||
| const ko = require('knockout'); | ||
| const buildRoutes = require('./routes'); | ||
|
|
||
| return { | ||
| title: ko.i18n('navigation.tools', 'Tools'), | ||
| buildRoutes, | ||
| navUrl: () => '#/tools', | ||
| icon: 'toolbox', | ||
| statusCss: () => "" | ||
| }; | ||
| } | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| define( | ||
| (require, factory) => { | ||
| const { AuthorizedRoute } = require('pages/Route'); | ||
| function routes(router) { | ||
| return { | ||
| '/tools': new AuthorizedRoute(() => { | ||
| require(['pages/tools/tool-manager'], function () { | ||
| router.setCurrentView('tool-manager'); | ||
| }); | ||
| }), | ||
| }; | ||
| } | ||
|
|
||
| return routes; | ||
| } | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| .modal-footer { | ||
| display: table; | ||
| width: 100%; | ||
| padding: 0; | ||
| border: 0; | ||
| margin-top: 18px; | ||
|
|
||
| .modal-buttons { | ||
| display: table-cell; | ||
| text-align: right; | ||
|
|
||
| button + button { | ||
| margin-left: 10px !important; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <heading-title params="name: ko.i18n('common.tools'), icon: 'toolbox', theme: 'dark'"></heading-title> | ||
| <div class="paddedWrapper"> | ||
| <div class="card-tools"> | ||
| <button type="button" class="btn btn-primary add-btn" | ||
| data-bind="click: () => { showModalAddTool(true) }, | ||
| css: classes({ | ||
| element: 'create-button', | ||
| extra: `${canCreateTool() ? '' : 'disabled'}`, | ||
| }), | ||
| text: ko.i18n('common.addTools', 'Add Tool')"></button> | ||
| <div class="card-tool-container" data-bind="hidden: loading, foreach: data_tools"> | ||
| <div class="card-tool flexed" data-bind="visible: $component.canReadTools() || enabled, click: $component.handleOpenLink, style:{ 'z-index': 0 }"> | ||
| <label for="toolName" data-bind="visible: isEditing, text: ko.i18n('columns.name', 'Name')"></label> | ||
| <div class="flex-between"> | ||
| <h3 data-bind="hidden: isEditing, text: name, click: () => window.open(url, '_blank')"></h3> | ||
| <input type="text" data-bind="visible: isEditing, textInput: name, keyupBubble: false" id="toolName"/> | ||
| <div style="width: 15% !important; align-items: center; display: flex; justify-content: flex-end;"> | ||
| <i class="fas fa-edit" id="editIcon" style="font-size: 24px; color: #2271A5; cursor: pointer;" data-bind="hidden: (isEditing || !$component.canUpdateTool()), click:() => $component.handleIsEditing(id), style:{ 'z-index': 9 }"></i> | ||
| <i class="far fa-trash-alt" id="deleteIcon" style="font-size: 24px; color: #F44; cursor: pointer; margin-left: 10px;" data-bind="hidden: (isEditing || !$component.canDeleteTool()), click:() => $component.handleDelete(id), style:{ 'z-index': 9 }"></i> | ||
| <i class="fas fa-check-square" id="completeIcon" style="font-size: 24px; color: #2271A5; cursor: pointer;" data-bind="visible: isEditing, click:() => $component.handleIsEdited(id), style:{ 'z-index': 9 }"></i> | ||
| </div> | ||
| </div> | ||
| <label for="toolUrl" data-bind="visible: isEditing, text: ko.i18n('common.url', 'URL')" style="margin-top: 19px"></label> | ||
| <input type="text" data-bind="visible: isEditing, textInput: url, keyupBubble: false" style="margin-top: 2px" id="toolUrl"/> | ||
| <p data-bind="hidden: isEditing, text: description" style="margin-top: 24px; font-weight: 500; font-size: 13px;"></p> | ||
| <label for="toolDescription" data-bind="visible: isEditing, text: ko.i18n('columns.description', 'Description')" style="margin-top: 19px;"></label> | ||
| <textarea rows="5" data-bind="visible: isEditing, value: description, keyupBubble: false" style="margin-top: 2px; max-width: 100%;" id="toolDescription"></textarea> | ||
| <div class="flex-between" style="margin-top: 18px; align-items: flex-start; justify-content: flex-start;" data-bind="visible: isEditing"> | ||
| <label for="toolAddDescription" data-bind="text: ko.i18n('columns.enabled', 'Enabled')" style="width: 10%;"></label> | ||
| <div class="material-switch pull-right" style=" margin-left: 8px;" data-bind="visible: isEditing"> | ||
| <input id="switchBtnTool" name="switchBtnTool" data-bind="checked: enabled" style="display: none;"/> | ||
| <label for="switchBtnTool" class="label-success" data-bind="css: enabled ? 'label-switch-enable' : '', click:() => $component.handleCheckVisible(id)"></label> | ||
| </div> | ||
| </div> | ||
| <div class="flex-between" style="margin-top: 10px; justify-content: flex-start; flex-wrap: wrap; row-gap: 10px"> | ||
| <div class="flexed" style="width: 50%" data-bind="visible: !isEditing"> | ||
| <p data-bind="text: ko.i18n('columns.created', 'Created')" style="font-size: 12.5px; margin-bottom: 5px;"></p> | ||
| <span data-bind="text: createdDate" style="font-weight: 500; font-size: 13px;"></span> | ||
| </div> | ||
| <div class="flexed" style="width: 50%" data-bind="visible: !isEditing && updatedDate"> | ||
| <p data-bind="text: ko.i18n('columns.updated', 'Updated')" style="font-size: 12.5px; margin-bottom: 5px;"></p> | ||
| <span data-bind="text: updatedDate" style="font-weight: 500; font-size: 13px;"></span> | ||
| </div> | ||
| <div class="flexed" style="width: 50%" data-bind="visible: !isEditing"> | ||
| <p data-bind="text: ko.i18n('columns.author', 'Author')" style="font-size: 12.5px; margin-bottom: 5px;"></p> | ||
| <span data-bind="visible: createdBy , text: createdBy" style="font-weight: 500; font-size: 13px;"></span> | ||
| <span data-bind="visible: !createdBy , text: 'anonymous'" style="font-weight: 500; font-size: 13px;"></span> | ||
| </div> | ||
| <div class="flexed material-switch" style="width: 50%" data-bind="visible: ($component.canUpdateTool() || $component.canDeleteTool()) && !isEditing"> | ||
| <p data-bind="text: ko.i18n('columns.enabled', 'Enabled')" style="font-size: 12.5px; padding-bottom:8px;"></p> | ||
| <label for="switchBtnTool" class="label-success" style="pointer-events: none;" data-bind="css: enabled ? 'label-switch-enable' : ''"></label> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <loading data-bind="visible: loading" params="status: ko.i18n('tool.loading', 'Loading tools')"></loading> | ||
|
|
||
| <atlas-modal params=" | ||
| showModal: showModalAddTool, | ||
| modifiers: ['sm'], | ||
| title: ko.i18n('common.addTools', 'Add Tool'), | ||
| data: { | ||
| handleDataAddTool: $component.handleDataAddTool, | ||
| handleCancelTool: $component.handleCancelTool, | ||
| newName: $component.newName, | ||
| newUrl: $component.newUrl, | ||
| newDescription: $component.newDescription, | ||
| toolIsVisible: $component.toolIsVisible, | ||
| toggleVisiableTool: $component.toggleVisiableTool, | ||
| }"> | ||
| <div class="flexed" style="padding: 8px 20px;"> | ||
| <div class="form-group" data-bind="css: {'has-error': (newName()?.trim() === '' || !newName()), 'has-success': newName()?.trim()}"> | ||
| <label for="toolAddName" class="control-label" data-bind="text: ko.i18n('tool.name', '* Name')"></label> | ||
| <input required type="text" id="toolAddName" data-bind="textInput: newName" type="text" class="form-control"/> | ||
| <span class="help-block" data-bind="visible: (newName()?.trim() === '' || !newName()), text: ko.i18n('tool.nameValidMess', 'Tool name cannot be empty')"></span> | ||
| </div> | ||
| <div class="form-group" data-bind="css: {'has-error': (newUrl()?.trim() === '' || !newUrl()), 'has-success': newUrl()?.trim()}"> | ||
| <label for="toolAddURL" class="control-label" data-bind="text: ko.i18n('tool.url', '* URL')"></label> | ||
| <input required type="text" id="toolAddURL" data-bind="textInput: newUrl" type="text" class="form-control"/> | ||
| <span class="help-block" data-bind="visible: (newUrl()?.trim() === '' || !newUrl()), text: ko.i18n('tool.urlValidMess', 'Tool url cannot be empty')"></span> | ||
| </div> | ||
| <div class="form-group" style="margin-top: 10px; align-items: flex-start; justify-content: flex-start;"> | ||
| <label for="toolAddDescription" data-bind="text: ko.i18n('columns.description', 'Description')" style="width: 30%;"></label> | ||
| <textarea rows="6" id="toolAddDescription" data-bind=" value: newDescription, keyupBubble: false" class="form-control" style="max-width: 100%;"></textarea> | ||
| </div> | ||
| <div class="flex-between" style="margin-top: 18px; align-items: flex-start; justify-content: flex-start;"> | ||
| <label for="toolAddDescription" data-bind="text: ko.i18n('columns.enabled', 'Enabled')" style="width: 10%;"></label> | ||
| <div class="material-switch pull-right" style="margin-left: 8px; width: 70%;"> | ||
| <input id="switchBtnTool" name="switchBtnTool" data-bind="checked: toolIsVisible()" style="display: none;"/> | ||
| <label for="switchBtnTool" class="label-success" data-bind="css: toolIsVisible() ? 'label-switch-enable' : '', click: toggleVisiableTool"></label> | ||
| </div> | ||
| </div> | ||
| <div class="modal-footer with-padding"> | ||
| <div class="modal-buttons"> | ||
| <button type="button" class="btn btn-primary" data-bind="text: ko.i18n('common.apply', 'Apply'), click: handleDataAddTool"></button> | ||
| <button type="button" class="btn btn-danger" data-bind="click: handleCancelTool, text: ko.i18n('common.cancel', 'Cancel')"></button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </atlas-modal> | ||
| </div> | ||
| <access-denied params="isAuthenticated: isAuthenticated, isPermitted: canReadTools"></access-denied> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may need some formatting applied to a few rows