Skip to content

Commit ee60013

Browse files
Notebook refactor (nasa#2883)
* Code refactoring per nasa#2825
1 parent 505796d commit ee60013

25 files changed

+759
-393
lines changed

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module.exports = (config) => {
8686
reports: ['html', 'lcovonly', 'text-summary'],
8787
thresholds: {
8888
global: {
89-
lines: 64
89+
lines: 65
9090
}
9191
}
9292
},

platform/forms/bundle.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ define([
3030
"./src/controllers/CompositeController",
3131
"./src/controllers/ColorController",
3232
"./src/controllers/DialogButtonController",
33-
"./src/controllers/SnapshotPreviewController",
3433
"./res/templates/controls/autocomplete.html",
3534
"./res/templates/controls/checkbox.html",
3635
"./res/templates/controls/datetime.html",
@@ -44,8 +43,7 @@ define([
4443
"./res/templates/controls/menu-button.html",
4544
"./res/templates/controls/dialog.html",
4645
"./res/templates/controls/radio.html",
47-
"./res/templates/controls/file-input.html",
48-
"./res/templates/controls/snap-view.html"
46+
"./res/templates/controls/file-input.html"
4947
], function (
5048
MCTForm,
5149
MCTControl,
@@ -56,7 +54,6 @@ define([
5654
CompositeController,
5755
ColorController,
5856
DialogButtonController,
59-
SnapshotPreviewController,
6057
autocompleteTemplate,
6158
checkboxTemplate,
6259
datetimeTemplate,
@@ -70,8 +67,7 @@ define([
7067
menuButtonTemplate,
7168
dialogTemplate,
7269
radioTemplate,
73-
fileInputTemplate,
74-
snapViewTemplate
70+
fileInputTemplate
7571
) {
7672

7773
return {
@@ -157,10 +153,6 @@ define([
157153
{
158154
"key": "file-input",
159155
"template": fileInputTemplate
160-
},
161-
{
162-
"key": "snap-view",
163-
"template": snapViewTemplate
164156
}
165157
],
166158
"controllers": [
@@ -194,14 +186,6 @@ define([
194186
"$scope",
195187
"dialogService"
196188
]
197-
},
198-
{
199-
"key": "SnapshotPreviewController",
200-
"implementation": SnapshotPreviewController,
201-
"depends": [
202-
"$scope",
203-
"openmct"
204-
]
205189
}
206190
],
207191
"components": [

platform/forms/res/templates/controls/snap-view.html

Lines changed: 0 additions & 36 deletions
This file was deleted.

platform/forms/src/controllers/SnapshotPreviewController.js

Lines changed: 0 additions & 132 deletions
This file was deleted.

src/plugins/notebook/components/notebook.vue renamed to src/plugins/notebook/components/Notebook.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
</div>
1010
<SearchResults v-if="search.length"
1111
ref="searchResults"
12-
:results="getSearchResults()"
12+
:domain-object="internalDomainObject"
13+
:results="searchedEntries"
1314
@changeSectionPage="changeSelectedSection"
15+
@updateEntries="updateEntries"
1416
/>
15-
1617
<div v-if="!search.length"
1718
class="c-notebook__body"
1819
>
@@ -105,10 +106,10 @@
105106
</template>
106107

107108
<script>
108-
import NotebookEntry from './notebook-entry.vue';
109+
import NotebookEntry from './NotebookEntry.vue';
109110
import Search from '@/ui/components/search.vue';
110-
import SearchResults from './search-results.vue';
111-
import Sidebar from './sidebar.vue';
111+
import SearchResults from './SearchResults.vue';
112+
import Sidebar from './Sidebar.vue';
112113
import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSection, setDefaultNotebookPage } from '../utils/notebook-storage';
113114
import { addNotebookEntry, createNewEmbed, getNotebookEntries } from '../utils/notebook-entries';
114115
import { throttle } from 'lodash';
@@ -153,6 +154,9 @@ export default {
153154
pages() {
154155
return this.getPages() || [];
155156
},
157+
searchedEntries() {
158+
return this.getSearchResults();
159+
},
156160
sections() {
157161
return this.internalDomainObject.configuration.sections || [];
158162
},
@@ -172,8 +176,6 @@ export default {
172176
return this.sections.find(section => section.isSelected);
173177
}
174178
},
175-
watch: {
176-
},
177179
beforeMount() {
178180
this.throttledSearchItem = throttle(this.searchItem, 500);
179181
},
@@ -259,7 +261,7 @@ export default {
259261
event.preventDefault();
260262
event.stopImmediatePropagation();
261263
262-
const snapshotId = event.dataTransfer.getData('snapshot/id');
264+
const snapshotId = event.dataTransfer.getData('openmct/snapshot/id');
263265
if (snapshotId.length) {
264266
const snapshot = this.snapshotContainer.getSnapshot(snapshotId);
265267
this.newEntry(snapshot);

0 commit comments

Comments
 (0)