Skip to content
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

Activity state display for plans in Gantt and Time list views #7370

Merged
merged 36 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7003f00
Add activity states domain object and interceptor to auto create one
shefalijoshi Jan 10, 2024
92a30a3
Add activity state inspector option
shefalijoshi Jan 10, 2024
4d4f83e
Only save status if we have a unique ids for activities
shefalijoshi Jan 10, 2024
02edb99
Include the id in the activity properties
shefalijoshi Jan 10, 2024
e47bfed
Don't show activity state section in the inspector if multiple activi…
shefalijoshi Jan 10, 2024
3c14025
Display activity properties when an activity row is selected in the t…
shefalijoshi Jan 10, 2024
65a7e7e
Use activity id as key if it is available
shefalijoshi Jan 18, 2024
176d344
Ensure the correct option is selected for activity states
shefalijoshi Jan 18, 2024
02c796a
Add status label
shefalijoshi Jan 19, 2024
b0a21d4
Refactor activity selection. Display activity properties
shefalijoshi Jan 19, 2024
dc1def5
Remove activity states plugin. Move the activity states interceptor t…
shefalijoshi Jan 19, 2024
b413a9b
Change activity states interceptor parameters to options
shefalijoshi Jan 19, 2024
bbf5454
Rename constants
shefalijoshi Jan 19, 2024
6def4c2
Fix activity states test
shefalijoshi Jan 19, 2024
9b85252
Merge branch 'master' of https://github.com/nasa/openmct into activit…
shefalijoshi Jan 19, 2024
5908f96
Merge branch 'master' into activity-state-display
shefalijoshi Jan 23, 2024
78f2852
Add e2e test for activity states feature.
shefalijoshi Jan 23, 2024
5c6a733
Address review comments. Rename variables, documentation.
shefalijoshi Jan 23, 2024
42ed592
No shallow copy
shefalijoshi Jan 23, 2024
122c84b
Suppress lint warning for conditionals
shefalijoshi Jan 25, 2024
6ee3177
Remove check for abort controller
shefalijoshi Jan 25, 2024
8e53866
Move classes to components
shefalijoshi Jan 25, 2024
619e253
number primitive
shefalijoshi Jan 25, 2024
6a7ea35
Closes #7369
charlesh88 Jan 25, 2024
6abfac7
Ensure 'notStarted' is the default state for activities
shefalijoshi Jan 25, 2024
fc64682
Remove extra quotes
shefalijoshi Jan 25, 2024
6d3242b
Closes #7369
charlesh88 Jan 25, 2024
795b35f
Merge remote-tracking branch 'origin/activity-state-display' into act…
charlesh88 Jan 25, 2024
875edd9
Merge branch 'master' into activity-state-display
shefalijoshi Jan 25, 2024
a5abc32
Merge branch 'activity-state-display' of https://github.com/nasa/open…
shefalijoshi Jan 25, 2024
2839246
Use generated key for vue
shefalijoshi Jan 25, 2024
e79b99e
Fix e2e tests
shefalijoshi Jan 25, 2024
4f6a792
Fix timelist test
shefalijoshi Jan 26, 2024
a494a24
Merge branch 'master' into activity-state-display
shefalijoshi Jan 26, 2024
e8637b1
Merge branch 'master' into activity-state-display
unlikelyzero Jan 26, 2024
f404116
Merge branch 'master' of https://github.com/nasa/openmct into activit…
shefalijoshi Jan 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove activity states plugin. Move the activity states interceptor t…
…o the plan plugin.
  • Loading branch information
shefalijoshi committed Jan 19, 2024
commit dc1def5549e33fa47bec557724b403f04af76a08
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@

openmct.install(openmct.plugins.Espresso());
openmct.install(openmct.plugins.MyItems());
openmct.install(openmct.plugins.ActivityStates());
openmct.install(
openmct.plugins.PlanLayout({
creatable: true
Expand Down
42 changes: 0 additions & 42 deletions src/plugins/activityStates/plugin.js

This file was deleted.

24 changes: 24 additions & 0 deletions src/plugins/plan/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,28 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import activityStatesInterceptor from '../activityStates/activityStatesInterceptor.js';
import { createActivityStatesIdentifier } from '../activityStates/createActivityStatesIdentifier.js';
import ganttChartCompositionPolicy from './GanttChartCompositionPolicy.js';
import ActivityInspectorViewProvider from './inspector/ActivityInspectorViewProvider.js';
import GanttChartInspectorViewProvider from './inspector/GanttChartInspectorViewProvider.js';
import { DEFAULT_CONFIGURATION } from './PlanViewConfiguration.js';
import PlanViewProvider from './PlanViewProvider.js';

const ACTIVITY_STATES_DEFAULT_NAME = 'Activity States';
/**
* @typedef {object} PlanOptions
* @property {boolean} creatable true/false to allow creation of a plan via the Create menu.
* @property {string} name The name of the activity states model.
* @property {string} namespace the namespace to use for the activity states object.
* @property {string} priority the priority of the interceptor. By default, it is low.
*/

/**
*
* @param {PlanOptions} options
* @returns {(function(*): void)|*}
*/
export default function (options = {}) {
return function install(openmct) {
openmct.types.addType('plan', {
Expand Down Expand Up @@ -70,5 +86,13 @@ export default function (options = {}) {
openmct.inspectorViews.addProvider(new ActivityInspectorViewProvider(openmct));
openmct.inspectorViews.addProvider(new GanttChartInspectorViewProvider(openmct));
openmct.composition.addPolicy(ganttChartCompositionPolicy(openmct));

//add activity states get interceptor
const { name = ACTIVITY_STATES_DEFAULT_NAME, namespace = '', priority } = options;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sweet

const identifier = createActivityStatesIdentifier(namespace);

openmct.objects.addGetInterceptor(
activityStatesInterceptor(openmct, { identifier, name, priority })
);
};
}
2 changes: 0 additions & 2 deletions src/plugins/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import ExampleUser from '../../example/exampleUser/plugin.js';
import ExampleFaultSource from '../../example/faultManagement/exampleFaultSource.js';
import GeneratorPlugin from '../../example/generator/plugin.js';
import ExampleImagery from '../../example/imagery/plugin.js';
import ActivityStatesPlugin from './activityStates/plugin.js';
import AutoflowPlugin from './autoflow/AutoflowTabularPlugin.js';
import BarChartPlugin from './charts/bar/plugin.js';
import ScatterPlotPlugin from './charts/scatter/plugin.js';
Expand Down Expand Up @@ -102,7 +101,6 @@ plugins.LocalTimeSystem = LocalTimeSystem;
plugins.RemoteClock = RemoteClock;

plugins.MyItems = MyItems;
plugins.ActivityStates = ActivityStatesPlugin;

plugins.StaticRootPlugin = StaticRootPlugin;

Expand Down