Skip to content
Merged
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
4 changes: 2 additions & 2 deletions public/staticwebapp.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"responseOverrides": {
"404": {
"rewrite": "/404.tsx"
"rewrite": "/404"
}
}
}
}
116 changes: 116 additions & 0 deletions src/app/docs/change-request-workflows-terminuscms-tour/page.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
---
title: Change Request Workflows in TerminusCMS
slug: change-request-workflows-terminuscms-tour
seo:
title: Change Request Workflows - TerminusCMS Tour
description: >-
This page details how change request workflows function in TerminusCMS to
enable safe collaboration
og_image: >-
https://assets.terminusdb.com/docs/technical-documentation-terminuscms-og.png
media:
- alt: Opening a change request
caption: ''
media_type: Image
title: Opening a change request
value: https://assets.terminusdb.com/docs/open-change-request.png
- alt: In a change request
caption: ''
media_type: Image
title: In a change request
value: https://assets.terminusdb.com/docs/in-change-request.png
- alt: TerminusCMS change request screen
caption: ''
media_type: Image
title: TerminusCMS change request screen
value: https://assets.terminusdb.com/docs/change-request-screen.png
- alt: Change Request diff viewer
caption: ''
media_type: Image
title: Change Request diff viewer
value: https://assets.terminusdb.com/docs/cr-diff.png
- alt: See messages in a change request for context
caption: ''
media_type: Image
title: See messages in a change request for context
value: https://assets.terminusdb.com/docs/cr-review-messages.png
- alt: List of change requests for review
caption: ''
media_type: Image
title: List of change requests for review
value: https://assets.terminusdb.com/docs/cr-review-home.png
- alt: Change request screen
caption: ''
media_type: Image
title: Change request screen
value: https://assets.terminusdb.com/docs/cr-review-page.png
---

TerminusCMS features change request workflows to ensure that changes to data and content are made safely with reviews in place to check changes.

## Creating a Change Request

When someone goes to make a change to content and data, TerminusCMS automatically opens a change request. This is a branch of the database that does not impact main. Users can make one or many changes within the change request -

![Opening a change request](https://assets.terminusdb.com/docs/open-change-request.png)

## In a Change Request

Users will see when they are in a change request. A banner with various options is included at the top of the page and there is also a notice on the left informing the user what they are connected to -

![In a change request](https://assets.terminusdb.com/docs/in-change-request.png)

> It is important to submit edits or additions in a change request. Without hitting the submit button, changes will not be saved to the change request.

When in a change request a user has three options -

1. Continue to make edits, deletions, and additions to the change request.
2. Exit the change request - This leaves the change request open and available to come back to at a later stage.
3. Submit the change request for review.

## Change Request Admin

Change requests are managed from the change request screen.

![TerminusCMS change request screen](https://assets.terminusdb.com/docs/change-request-screen.png)

The screen has four tabs -

1. Open - Open change requests that can be continued with or submitted for review.
2. Review - Change requests that have been submitted for review.
3. Merged - Previous approved commits to the database.
4. Rejected - Rejected change requests.

## Review Change Requests

On the change request screen, select 'review'. Change requests that users have submitted for review are listed in chronological order.

![Change Request diff viewer](https://assets.terminusdb.com/docs/cr-diff.png)

_Change requests feature a diff viewer to see what's changed_

![See messages in a change request for context](https://assets.terminusdb.com/docs/cr-review-messages.png)

_Write messages to add more context_

![List of change requests for review](https://assets.terminusdb.com/docs/cr-review-home.png)

![Change request screen](https://assets.terminusdb.com/docs/cr-review-page.png)

To review a change request, do the following -

* Click the 'review' button for the corresponding change request.
* The next screen has all of the details of the change request with two tabs -

* The first is the diff view with drop-down options to display the changes that have been made
* The second is the messages tab, this displays the messages entered when creating and submitting the change request and can provide context.

* Users can either accept or reject a change request and leave a message explaining their reasoning behind each
* Accepted change requests will move the change request into the merged tab - users are able to view the diff to see the changes of past commits
* Rejected change requests move into the rejected tab on the change request home screen

## Conflicts & Collaboration

In order to avoid changes being squashed by other users when multiple people make changes to data and content, TerminusCMS checks the database to see if there have been changes made before a user reviews and merges a change request.

In order to proceed. The user must rebase their change request to incorporate the latest changes into their own change request. A prompt tells the user what to do.
1 change: 0 additions & 1 deletion src/lib/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ export const navigation: Navigation[] = [
links: [
{
title: 'Query Examples',
href: '/docs/woql-query-examples',
links: [
{
title: 'Customer Data Processing',
Expand Down