Skip to content

Commit

Permalink
Fix couchdbsearchfolder and allow clocky reports (#6770)
Browse files Browse the repository at this point in the history
* Fix CouchDBSearchFolder plugin to have unique identifiers.
Allow ttt-reports to be viewed as web pages

* Remove ttt-report type from WebPage view provider. This is being moved to the viper-openmct repo instead

* Adds check for classList

* Add WebPage to the components list

* Remove uuid and use the folder name as the identifier instead

* Remove focused test

---------

Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
  • Loading branch information
3 people committed Jul 13, 2023
1 parent 5031010 commit 795d7a7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
19 changes: 12 additions & 7 deletions src/plugins/CouchDBSearchFolder/plugin.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
export default function (folderName, couchPlugin, searchFilter) {
const DEFAULT_NAME = 'CouchDB Documents';

return function install(openmct) {
const couchProvider = couchPlugin.couchProvider;
//replace any non-letter/non-number with a hyphen
const couchSearchId = (folderName || DEFAULT_NAME).replace(/[^a-zA-Z0-9]/g, '-');
const couchSearchName = `couch-search-${couchSearchId}`;

openmct.objects.addRoot({
namespace: 'couch-search',
key: 'couch-search'
namespace: couchSearchName,
key: couchSearchName
});

openmct.objects.addProvider('couch-search', {
openmct.objects.addProvider(couchSearchName, {
get(identifier) {
if (identifier.key !== 'couch-search') {
if (identifier.key !== couchSearchName) {
return undefined;
} else {
return Promise.resolve({
identifier,
type: 'folder',
name: folderName || 'CouchDB Documents',
name: folderName || DEFAULT_NAME,
location: 'ROOT'
});
}
Expand All @@ -25,8 +30,8 @@ export default function (folderName, couchPlugin, searchFilter) {
openmct.composition.addProvider({
appliesTo(domainObject) {
return (
domainObject.identifier.namespace === 'couch-search' &&
domainObject.identifier.key === 'couch-search'
domainObject.identifier.namespace === couchSearchName &&
domainObject.identifier.key === couchSearchName
);
},
load() {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/CouchDBSearchFolder/pluginSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import CouchDBSearchFolderPlugin from './plugin';

describe('the plugin', function () {
let identifier = {
namespace: 'couch-search',
key: 'couch-search'
namespace: 'couch-search-CouchDB-Documents',
key: 'couch-search-CouchDB-Documents'
};
let testPath = '/test/db';
let openmct;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/viewLargeAction/viewLargeAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class ViewLargeAction {

return (
childElement &&
!childElement.classList.contains('js-main-container') &&
!childElement?.classList.contains('js-main-container') &&
!this.openmct.router.isNavigatedObject(objectPath)
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/ui/components/components.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
import ObjectView from './ObjectView.vue';
import StackedPlot from '../../plugins/plot/stackedPlot/StackedPlot.vue';
import Plot from '../../plugins/plot/Plot.vue';
import WebPage from '../../plugins/webPage/components/WebPage.vue';

export default {
ObjectView,
StackedPlot,
Plot
Plot,
WebPage
};

0 comments on commit 795d7a7

Please sign in to comment.