Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 8 additions & 24 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@ const authenticatedRoutes = [
path: 'components',
name: 'system:components',
component: () => import('../views/system/ComponentsView.vue'),
children: [
{
path: ':componentId/dashboards',
name: 'system-component-dashboards',
component: () =>
import('../views/system/partials/ComponentDashboardsView.vue'),
},
],
},
{
path: 'authorizations',
Expand Down Expand Up @@ -194,6 +186,14 @@ const authenticatedRoutes = [
requiresAuth: true,
},
},
{
path: '/profiles/build-props',
name: 'profile-build-props',
component: () => import('../views/profile/ProfileBuildPropsView.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/profiles/:id',
name: 'profile:view',
Expand Down Expand Up @@ -244,14 +244,6 @@ const authenticatedRoutes = [
requiresAuth: true,
},
},
{
path: '/admin/import',
name: 'admin-import',
component: () => import('../views/admin/ImportView.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/component-definitions',
name: 'component-definitions',
Expand Down Expand Up @@ -748,14 +740,6 @@ const authenticatedRoutes = [
requiresAuth: true,
},
},
{
path: '/preferences',
name: 'preferences',
component: () => import('../views/PreferencesView.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/about',
name: 'about',
Expand Down
9 changes: 4 additions & 5 deletions src/views/LeftSideNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ const links = ref<Array<NavigationItem>>([
title: 'Profiles',
abbr: 'PR',
},
{
name: 'profile-build-props',
title: 'Build Profile by Props',
},
{
name: 'component-definitions',
title: 'Component Definitions',
Expand All @@ -119,11 +123,6 @@ const links = ref<Array<NavigationItem>>([
name: 'users-list',
title: 'System Users',
},
{
name: 'admin-import',
title: 'Import',
abbr: 'IMP',
},
],
},
]);
Expand Down
41 changes: 39 additions & 2 deletions src/views/catalog/CatalogControl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,22 @@
<div class="flex items-start justify-between gap-4">
<div>
<TertiaryButton v-if="!statement">Add Statement</TertiaryButton>
<TertiaryButton v-if="!objective" class="ml-2"
<TertiaryButton
v-if="statement"
class="ml-2"
@click="showEditStatement = true"
>Edit Statement</TertiaryButton
>
<TertiaryButton
v-if="!objective"
class="ml-2"
@click="showEditObjective = true"
>Add Objective</TertiaryButton
>
<TertiaryButton v-if="!guidance" class="ml-2"
<TertiaryButton
v-if="!guidance"
class="ml-2"
@click="showEditGuidance = true"
>Add Guidance</TertiaryButton
>

Expand Down Expand Up @@ -100,6 +112,27 @@
:parent-control="props.control"
v-model="showControlForm"
/>
<ControlPartEditModal
v-model="showEditStatement"
:catalog="catalog"
:control="props.control"
type="statement"
@updated="onUpdated"
/>
<ControlPartEditModal
v-model="showEditObjective"
:catalog="catalog"
:control="props.control"
type="assessment-objective"
@updated="onUpdated"
/>
<ControlPartEditModal
v-model="showEditGuidance"
:catalog="catalog"
:control="props.control"
type="guidance"
@updated="onUpdated"
/>
<ControlEditModal
v-model="showEdit"
:catalog="catalog"
Expand All @@ -118,6 +151,7 @@ import { type Catalog, type Control } from '@/oscal';
import TertiaryButton from '@/volt/TertiaryButton.vue';
import ControlCreateModal from '@/components/catalogs/ControlCreateModal.vue';
import ControlEditModal from '@/components/catalogs/ControlEditModal.vue';
import ControlPartEditModal from '@/components/catalogs/ControlPartEditModal.vue';
import type { Part } from '@/oscal';
import PartDisplayEditor from '@/components/PartDisplayEditor.vue';
import { useRouter } from 'vue-router';
Expand Down Expand Up @@ -179,6 +213,9 @@ function getPart(type: string) {

const showControlForm = ref<boolean>(false);
const showEdit = ref<boolean>(false);
const showEditStatement = ref<boolean>(false);
const showEditObjective = ref<boolean>(false);
const showEditGuidance = ref<boolean>(false);

function controlCreated(control: Control) {
controls.value?.push(control);
Expand Down
1 change: 0 additions & 1 deletion src/views/catalog/CatalogView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ async function deleteCatalog(uuid: string, title: string) {
function deleteCurrentCatalog() {
deleteCatalog(catalogId.value, catalog.value?.metadata?.title || '');
}

function reloadLists() {
groupExecute(`/api/oscal/catalogs/${catalogId.value}/groups`);
catalogExecute(`/api/oscal/catalogs/${catalogId.value}/controls`);
Expand Down
Loading