Fixing serverId issues

2017-06-16 16:36:34 -03:00
1 parent 95533c785b
commit b4bb44625c
@@ -1,4 +1,2 @@
 import './seriesDetailsModal';
-import './serverInformation';
 import './studylist';
-import './themeSelector';
@@ -1,15 +0,0 @@
-import './serverInformationDicomWeb/serverInformationDicomWeb.html';
-import './serverInformationDicomWeb/serverInformationDicomWeb.js';
-
-import './serverInformationDimse/serverInformationDimse.html';
-import './serverInformationDimse/serverInformationDimse.js';
-
-import './serverInformationForm/serverInformationForm.html';
-import './serverInformationForm/serverInformationForm.js';
-
-import './serverInformationList/serverInformationList.html';
-import './serverInformationList/serverInformationList.js';
-
-import './serverInformationModal/serverInformationModal.html';
-import './serverInformationModal/serverInformationModal.styl';
-import './serverInformationModal/serverInformationModal.js';
@@ -1,50 +0,0 @@
-<template name="serverInformationDicomWeb">
-    <div class="row">
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='wadoUriRoot'}}
-        </div>
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='wadoRoot'}}
-        </div>
-        <div class="col-lg-6">
-            {{>inputSelect labelClass='form-group' key='imageRendering' hideSearch=true
-                options=(clone placeholder='Select an option')}}
-        </div>
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='qidoRoot'}}
-        </div>
-        <div class="col-lg-6">
-            <strong>QIDO options</strong>
-            <div class="form-group">
-                <div class="form-control">
-                    <div class="checkbox">
-                        {{>inputCheckbox key='qidoSupportsIncludeField'}}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Request options</h4>
-    {{#group class='row' key='requestOptions'}}
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='auth'}}
-        </div>
-        <div class="col-lg-6">
-            <strong>Logging options</strong>
-            <div class="form-group">
-                <div class="form-control clearfix">
-                    <div class="checkbox pull-left">
-                        {{>inputCheckbox key='logRequests'}}
-                    </div>
-                    <div class="checkbox pull-left">
-                        {{>inputCheckbox key='logResponses'}}
-                    </div>
-                    <div class="checkbox pull-left">
-                        {{>inputCheckbox key='logTiming'}}
-                    </div>
-                </div>
-            </div>
-        </div>
-    {{/group}}
-</template>
@@ -1,10 +0,0 @@
-Template.serverInformationDicomWeb.onRendered(() => {
-    const instance = Template.instance();
-    instance.autorun(function() {
-        const mode = instance.data.mode.get();
-        if (mode === 'edit') {
-            const data = instance.data.currentItem.get();
-            instance.data.form.value(data);
-        }
-    });
-});
@@ -1,60 +0,0 @@
-<template name="serverInformationDimse">
-    <div class="row">
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='wadoUriRoot'}}
-        </div>
-    </div>
-    <div class="panel panel-default panel-body">
-        <div class="clearfix">
-            <h4 class="pull-left">Peer List</h4>
-            {{#button class='btn btn-primary pull-right'
-                action='newPeer' params=peer
-            }}New peer{{/button}}
-        </div>
-        <hr>
-        {{#group class='row' key='peers' arrayValues=true}}
-            {{#each peer in instance.peers.get}}
-                {{#group class='col-lg-6'}}
-                    <div class="panel panel-default panel-body">
-                        <div class="row">
-                            <div class="col-lg-6">
-                                {{>inputText class='form-control' key='aeTitle'}}
-                            </div>
-                            <div class="col-lg-6">
-                                {{>inputText class='form-control' key='hostAE'}}
-                            </div>
-                            <div class="col-lg-6">
-                                {{>inputText class='form-control' key='host'}}
-                            </div>
-                            <div class="col-lg-6">
-                                {{>inputText class='form-control' key='port'}}
-                            </div>
-                            <div class="col-lg-12">
-                                <strong>Settings</strong>
-                                <div class="form-group">
-                                    <div class="form-control height-auto clearfix">
-                                        <div class="checkbox pull-left">
-                                            {{>inputCheckbox key='default'}}
-                                        </div>
-                                        <div class="checkbox pull-left">
-                                            {{>inputCheckbox key='server'}}
-                                        </div>
-                                        <div class="checkbox pull-left">
-                                            {{>inputCheckbox key='supportsInstanceRetrievalByStudyUid'}}
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-12 text-right">
-                                {{#button class='btn btn-sm btn-danger'
-                                    action='removePeer' params=@index
-                                }}Remove{{/button}}
-                            </div>
-                        </div>
-                    </div>
-                {{/group}}
-            {{/each}}
-        {{/group}}
-    </div>
-    <hr>
-</template>
@@ -1,38 +0,0 @@
-Template.serverInformationDimse.onCreated(() => {
-    const instance = Template.instance();
-    instance.peers = new ReactiveVar([]);
-    instance.autorun(() => {
-        const currentItem = instance.data.currentItem.get();
-        if (currentItem) {
-            instance.peers.set(currentItem.peers || []);
-        }
-    });
-    const api = instance.data.api;
-    _.extend(api, {
-        newPeer() {
-            const peers = instance.peers.get();
-            peers.push({});
-            instance.peers.set(peers);
-        },
-        removePeer(peerIndex) {
-            const peers = instance.peers.get();
-            peers.splice(peerIndex, 1);
-            instance.peers.set(peers);
-
-            const data = instance.data.currentItem.get();
-            data.peers = peers;
-            Tracker.afterFlush(() => instance.data.form.value(data));
-        }
-    });
-});
-
-Template.serverInformationDimse.onRendered(() => {
-    const instance = Template.instance();
-    instance.autorun(() => {
-        const mode = instance.data.mode.get();
-        if (mode === 'edit') {
-            const data = instance.data.currentItem.get();
-            instance.data.form.value(data);
-        }
-    });
-});
@@ -1,27 +0,0 @@
-<template name="serverInformationForm">
-    {{#form class='server-information-form' schema=instance.currentSchema api=this.api}}
-        {{>inputHidden key='_id'}}
-        <div class="row">
-            <div class="col-lg-6">
-                {{>inputText labelClass='form-group' key='name'}}
-            </div>
-            <div class="col-lg-6">
-                {{>inputSelect labelClass='form-group' key='type'
-                    hideSearch=true disabled=(eq this.mode.get 'edit')
-                    options=(clone placeholder='Choose a server type')}}
-            </div>
-        </div>
-        <hr>
-        {{#if eq this.serverType.get 'dicomWeb'}}
-          {{>serverInformationDicomWeb this}}
-        {{/if}}
-        {{#if eq this.serverType.get 'dimse'}}
-          {{>serverInformationDimse this}}
-        {{/if}}
-        {{#if this.serverType.get}}
-            <div>
-                {{#button class='btn btn-primary' action='save'}}Save{{/button}}
-            </div>
-        {{/if}}
-    {{/form}}
-</template>
@@ -1,72 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { DICOMWebServer as dicomSchema } from 'meteor/ohif:study-list/both/schema/servers.js';
-import { DIMSEServer as dimseSchema } from 'meteor/ohif:study-list/both/schema/servers.js';
-
-Template.serverInformationForm.onCreated(() => {
-    const instance = Template.instance();
-
-    instance.data.api = {
-        save() {
-            // Stop here if the form validation fails
-            if (!instance.data.form.validate()) {
-                return;
-            }
-
-            // Get the current form data
-            const formData = instance.data.form.value();
-
-            // Call the save method
-            Meteor.call('serverSave', formData, function(error) {
-                if (error) {
-                    // TODO: check for errors: not-authorized, data-write
-                }
-
-                instance.data.resetState();
-            });
-        }
-    };
-
-    instance.currentSchema = new ReactiveVar(dicomSchema);
-});
-
-Template.serverInformationForm.onRendered(() => {
-    const instance = Template.instance();
-
-    instance.data.$form = instance.$('form').first();
-    instance.data.form = instance.data.$form.data('component');
-
-    // Handle the server type
-    instance.autorun(() => {
-        // Get the server type component
-        const typeComponent = instance.$('[data-key=type] :input').data('component');
-
-        // Run this computation every time the user change the server type
-        typeComponent.depend();
-
-        // Get the current server type value
-        const type = typeComponent.value();
-
-        // Set the serverType reactive value
-        instance.data.serverType.set(type);
-
-        // Change the schema based on the selected server type
-        if (type === 'dimse') {
-            instance.currentSchema.set(dimseSchema);
-        } else {
-            instance.currentSchema.set(dicomSchema);
-        }
-    });
-
-    // Handle the form mode (edit or add)
-    instance.autorun(() => {
-        const mode = instance.data.mode.get();
-
-        // Check if it is on edit mode and load the saved data
-        if (mode === 'edit') {
-            const data = instance.data.currentItem.get();
-            instance.data.form.value(data);
-        }
-    });
-});
@@ -1,45 +0,0 @@
-<template name="serverInformationList">
-    {{#form api=instance.api}}
-        <table id="tblServer" class="table">
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Type</th>
-                    <th class="text-right">Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                {{#each server in servers}}
-                    <tr>
-                        <td>{{server.name}}</td>
-                        <td>{{server.type}}</td>
-                        <td class="text-right">
-                            <div class="btn-group" role="group" aria-label="Actions">
-                                {{#button class='btn btn-sm btn-default' action='use' params=server title='Use this server' disabled=(isActive server)}}
-                                    {{#if isActive server}}
-                                        <i class="fa fa-check-square-o"></i>
-                                    {{else}}
-                                        <i class="fa fa-square-o"></i>
-                                    {{/if}}
-                                {{/button}}
-                                {{#button class='btn btn-sm btn-default' action='edit' params=server title='Edit' disabled=(eq server.origin 'json')}}
-                                    <i class="fa fa-pencil"></i>
-                                {{/button}}
-                                {{#button class='btn btn-sm btn-danger' action='delete' params=server title='Remove' disabled=(eq server.origin 'json')}}
-                                    <i class="fa fa-trash"></i>
-                                {{/button}}
-                            </div>
-                        </td>
-                    </tr>
-                {{else}}
-                    <tr>
-                        <td class="text-center" colspan="3">No servers found</td>
-                    </tr>
-                {{/each}}
-            </tbody>
-        </table>
-        {{#button class='btn btn-sm btn-default' action='add'}}
-            <i class="fa fa-plus"></i> Add a new server
-        {{/button}}
-    {{/form}}
-</template>
@@ -1,47 +0,0 @@
-Template.serverInformationList.onCreated(() => {
-    const instance = Template.instance();
-
-    instance.api = {
-        add: () => instance.data.mode.set('create'),
-        edit(server) {
-            instance.data.currentItem.set(server);
-            instance.data.mode.set('edit');
-        },
-        delete(server) {
-            // TODO: Replace this for confirmation dialog after LT-refactor is merged back to master
-            if (!confirm('Are you sure you want to remove this peer?')) {
-                return;
-            }
-
-            Meteor.call('serverRemove', server._id, error => {
-                // TODO: check for errors: data-write
-            });
-        },
-        use(server) {
-            Meteor.call('serverSetActive', server._id, error => {
-                // TODO: check for errors: data-write
-            });
-        }
-    };
-});
-
-Template.serverInformationList.helpers({
-    isActive: function(server) {
-        const currentServer = CurrentServer.findOne();
-        if (!currentServer) {
-            return;
-        }
-
-        return server._id === currentServer.serverId;
-    },
-    servers: function() {
-        const options = {
-            sort: {
-                origin: -1,
-                type: 1,
-                name: 1
-            }
-        };
-        return Servers.find({}, options).fetch();
-    }
-});
@@ -1,12 +0,0 @@
-<template name="serverInformationModal">
-    {{#dialogSimple (extend this dialogClass='modal-lg' title='Server Information')}}
-        {{#if (eq instance.container.mode.get "list")}}
-            {{>serverInformationList instance.container}}
-        {{else}}
-            {{>serverInformationForm instance.container}}
-        {{/if}}
-        {{#section 'dialogFooter'}}{{#unless (eq instance.container.mode.get "list")}}{{!
-            }}<button type="button" class="btn btn-default js-back">Back</button>{{!
-        }}{{/unless}}{{/section}}
-    {{/dialogSimple}}
-</template>
@@ -1,23 +0,0 @@
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-
-Template.serverInformationModal.onCreated(function() {
-    const instance = Template.instance();
-    instance.container = {
-        mode: new ReactiveVar('list'),
-        serverType: new ReactiveVar(null),
-        currentItem: new ReactiveVar(null),
-        $form: null,
-        resetState: function() {
-            instance.container.mode.set('list');
-            instance.container.serverType.set(null);
-            instance.container.currentItem.set(null);
-        }
-    };
-});
-
-Template.serverInformationModal.events({
-    'click .js-back'(event, instance) {
-        instance.container.resetState();
-    }
-});
@@ -1,5 +0,0 @@
-.server-information-form
-  label.wrapper
-    display: block
-  .checkbox
-    margin: 0 8px 0 0
@@ -1,3 +0,0 @@
-import './themeSelectorModal/themeSelectorModal.html';
-import './themeSelectorModal/themeSelectorModal.styl';
-import './themeSelectorModal/themeSelectorModal.js';
@@ -1,17 +0,0 @@
-<template name="themeSelectorModal">
-    {{#dialogForm (extend this
-        id='themeSelectorModal' dialogClass='modal-lg' confirmLabel='Apply theme'
-        title='Themes' titleIcon='fa fa-sliders'
-    )}}
-        <ul class="theme-list text-center">
-            {{#each theme in themes}}
-                <li class="text-center preview-theme {{printClassIfSelected theme}}" data-theme="{{theme}}">
-                    <div class="icon-wrapper">
-                        <span class="theme-icon-{{theme}}"></span>
-                    </div>
-                    <h4 class="theme-title">{{ucFirst theme}}</h4>
-                </li>
-            {{/each}}
-        </ul>
-    {{/dialogForm}}
-</template>
@@ -1,80 +0,0 @@
-import { Template } from 'meteor/templating';
-import { ReactiveDict } from 'meteor/reactive-dict';
-
-const DEFAULT_THEME = 'tide';
-
-const getCurrentTheme = () => sessionStorage.getItem('theme');
-
-const setActualTheme = theme => sessionStorage.setItem('theme', theme);
-
-const addThemeToBody = theme => document.body.classList.add('theme-' + theme);
-
-const removeThemesFromBody = () => {
-    const classList = document.body.classList;
-
-    for (let i = classList.length - 1; i >= 0; i--) {
-        if (classList[i].search('theme-') !== -1) {
-            document.body.classList.remove(classList[i]);
-        }
-    }
-};
-
-Template.themeSelectorModal.onCreated(() => {
-    const instance = Template.instance();
-    let currentTheme = getCurrentTheme();
-    if (!currentTheme) {
-        currentTheme = DEFAULT_THEME;
-        setActualTheme(currentTheme);
-    }
-
-    instance.state = new ReactiveDict();
-    instance.state.set('selectedTheme', currentTheme);
-
-    addThemeToBody(currentTheme);
-
-    instance.container = {
-        currentTheme,
-
-        previewTheme(theme, state) {
-            state.set('selectedTheme', theme);
-            removeThemesFromBody();
-            addThemeToBody(theme);
-        },
-
-        applyTheme(state) {
-            setActualTheme(state.get('selectedTheme'));
-        },
-
-        resetState(state) {
-            const theme = getCurrentTheme();
-
-            state.set('selectedTheme', theme);
-            removeThemesFromBody();
-            addThemeToBody(theme);
-        }
-    };
-
-    const { promise } = instance.data;
-    promise.then(() => instance.container.applyTheme(instance.state));
-    promise.catch(() => instance.container.resetState(instance.state));
-});
-
-Template.themeSelectorModal.helpers({
-    themes: [ 'crickets', 'honeycomb', 'mint', 'overcast', 'quartz', 'tide', 'tigerlily' ],
-
-    ucFirst(text) {
-        return text.charAt(0).toUpperCase() + text.slice(1);
-    },
-
-    printClassIfSelected(theme) {
-        const instance = Template.instance();
-
-        return theme === instance.state.get('selectedTheme') ? 'selected' : '';
-    }
-});
-
-Template.themeSelectorModal.events({
-    'click .preview-theme'(event, instance) {
-        instance.container.previewTheme(event.currentTarget.dataset.theme, instance.state);
-    }
-});
@@ -1,36 +0,0 @@
-@import "{ohif:design}/app.styl"
-
-#themeSelectorModal
-  .theme-list
-    list-style: none
-    padding: 0
-    
-    li
-      display: inline-block
-      cursor: pointer
-      margin-right: 10px
-      margin-bottom: 10px
-      padding: 10px
-      width: 110px
-      theme('border', '1px solid $uiBorderColorDark')
-      
-      &:hover 
-        background-color: rgba(21, 25, 30, 0.7)
-      
-      &:last-child
-        margin-right: 0
-        
-      &.selected
-        theme('border', '3px solid $uiBorderColorActive')
-        padding: 7px;
-        
-      .icon-wrapper
-        height: 64px
-        width: 64px
-        margin: 0 auto
-        line-height: 6.5
-      
-      .theme-title 
-        font-weight: normal
-        font-size: 1.1em
-        margin-bottom: 0