Skip to content

Commit

Permalink
Merge pull request #534 from nfdi4plants/arccommander-menu
Browse files Browse the repository at this point in the history
Arccommander-menu
  • Loading branch information
Brilator authored Dec 4, 2024
2 parents ad54f60 + af7199a commit 02a127e
Show file tree
Hide file tree
Showing 25 changed files with 77 additions and 36 deletions.
24 changes: 22 additions & 2 deletions astro.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export default defineConfig({
{
label: 'DataHUB',
collapsed: true,
// autogenerate: { directory: 'datahub' },
items:[
'datahub',
{
Expand Down Expand Up @@ -123,7 +122,28 @@ export default defineConfig({
label: 'ARC Commander',
// Collapse the group by default.
collapsed: true,
autogenerate: { directory: 'arc-commander' },
items:[
'arc-commander',
{
label: 'Setup',
collapsed: false,
autogenerate: { directory: 'arc-commander/setup'},
},
'arc-commander/before-we-start',
'arc-commander/arc-commander-quick-start',
'arc-commander/arc-commander-quick-start-expert',
{
label: 'Central Functions',
collapsed: false,
autogenerate: { directory: 'arc-commander/central-functions'},
},
{
label: 'ISA metadata',
collapsed: false,
autogenerate: { directory: 'arc-commander/isa'},
},
'arc-commander/lfs',
]
},
{
label: 'Swate',
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ lastUpdated: 2023-01-27
authors:
- dominik-brilhaus
pagefind: false
sidebar:
order: 4.6
---

## About this guide
Expand Down
4 changes: 3 additions & 1 deletion src/content/docs/arc-commander/arc-commander-quick-start.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ authors:
- martin-kuhl
- dominik-brilhaus
lastUpdated: 2023-06-09
sidebar:
order: 4.5
---

import NewARC from '@components/mdx/NewARC.mdx'
Expand All @@ -14,7 +16,7 @@ In this guide we focus on how to use the [ARC Commander][def] to create your ARC

## Before we can start

☑️ Please [install ARC Commander](/nfdi4plants.knowledgebase/arc-commander/installation)
☑️ Please [install ARC Commander](/nfdi4plants.knowledgebase/arc-commander/setup/installation)
☑️ Find <a href="/nfdi4plants.knowledgebase/arc-commander/tutorial-command-line" target="_blank">the command line</a> on your system
💡 Consider reading about [ARC](/nfdi4plants.knowledgebase/core-concepts/arc) and the [ARC Commander][def]
💡 After concluding this quickstart, consider exploring the [ARC Commander manual][def] for a more detailed usage instruction.
Expand Down
7 changes: 4 additions & 3 deletions src/content/docs/arc-commander/before-we-start.mdx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
title: "Before we start"
title: Before we start
lastUpdated: 2023-06-14
sidebar:
order: 4
---


After the setup steps, you're all set and ready to start using the ARC Commander. 🎉
After the setup, you're all set and ready to start using the ARC Commander. 🎉

:::tip
We recommend trying the [ARC Commander QuickStart](/nfdi4plants.knowledgebase/arc-commander/arc-commander-quick-start) for your first steps with the ARC Commander.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: "Working on an ARC branch"
sidebar:
order: 10
---


## Challenge

- No direct access rights to the main branch (which can be handled via the [DataHUB](/nfdi4plants.knowledgebase/datahub)) or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: Config User
lastUpdated: 2022-12-13
sidebar:
order: 9
---


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Connect an ARC to the DataHUB"
lastUpdated: 2022-12-13
sidebar:
order: 7
---

In case you have not yet connected your local repository to a remote one, you can specify the remote repository with the flag `--repositoryaddress` or `-r` in combination with a URL + ".git", e.g.,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
---
title: "Clone an ARC from the DataHUB"
title: Clone an ARC from the DataHUB
lastUpdated: 2022-12-20
authors:
- martin-kuhl
sidebar:
order: 6
---


Using `arc get -r` followed by a URL + ".git" enables you to clone an already existing ARC as a local repository, e.g.,

```bash
arc get -r https://github.com/nfdi4plants/ARC.git
arc get -r https://git.nfdi4plants.org/muehlhaus/ArcPrototype
```

:::tip
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Initialize an ARC"
title: Initialize an ARC
lastUpdated: 2022-12-13
sidebar:
order: 5
---

- The basic ARC folder structure can be created using `arc init`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Sychronize an ARC"
lastUpdated: 2022-12-13
sidebar:
order: 8
---

The command `arc sync` handles multiple operations for your ARC in one step. It will
Expand Down
12 changes: 0 additions & 12 deletions src/content/docs/arc-commander/isa.mdx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ title: "Export ARC metadata"
lastUpdated: 2022-12-20
authors:
- martin-kuhl
sidebar:
order: 15
---


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Assay"
lastUpdated: 2022-12-13
sidebar:
order: 13
---

## Addition of assays
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Investigation"
lastUpdated: 2022-12-13
sidebar:
order: 11
---

:::caution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: "Study"
lastUpdated: 2022-12-13
tableOfContents:
maxHeadingLevel: 4
sidebar:
order: 12
---

:::caution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: "Update ISA metadata"
lastUpdated: 2022-12-21
sidebar:
order: 14
---

Users have the possibility to update the metadata in the isa.investigation.xlsx by filling it with metadata from the study and assay files in the respective subdirectories via the command

```bash
Expand Down
2 changes: 2 additions & 0 deletions src/content/docs/arc-commander/lfs.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ title: Large File Storage (LFS)
lastUpdated: 2024-10-31
author:
- dominik-brilhaus
sidebar:
order: 16
---


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ author:
- martin-kuhl
- dominik-brilhaus
- david-zimmer
sidebar:
order: 3
---


Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
title: Installation of Git and Git LFS
lastUpdated: 2023-11-24
author:
- dominik-brilhaus
sidebar:
order: 1
---


In order to use the ARC Commander, Git (version ≥ 2.32.0) and Git LFS must be installed on your computer.

:::tip
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: "Installing the ARC Commander"
lastUpdated: 2022-12-20
sidebar:
order: 2
---
import { Steps } from '@astrojs/starlight/components';
import { Tabs, TabItem } from '@astrojs/starlight/components';
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/git/git-syncing-recommendation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In DataPLANT tools and services, the individual sync steps are called "commit".
## Add a message to communicate your ARC's evolution

We recommend adding a message that shortly summarizes, what you did since you last synced your ARC.
Commit messages can be added via [ARCitect's](/nfdi4plants.knowledgebase/arcitect) commit menu or via [ARC commander](/nfdi4plants.knowledgebase/arc-commander/synchronization).
Commit messages can be added via [ARCitect's](/nfdi4plants.knowledgebase/arcitect) commit menu or via [ARC commander](/nfdi4plants.knowledgebase/arc-commander/central-functions/synchronization).

The following exemplifies Viola's commit messages along with the progress of her ARC:

Expand Down
7 changes: 4 additions & 3 deletions src/content/docs/git/git-troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ authors:
Some reasons, why we now sometimes run into git issues

- Over the past years we asked users (e.g. during trainings) to install git with minium required guidance
- Even though more advanced tools (ARCitect) now bring their own git installation, there might still occur interferences with older installations
- There might also be issues of tools (e.g. ARCitect and ARC commander) or different versions of those tools handling git-related tasks a bit differently or more / less strict (e.g. things like `main` as the default branch)
- Even though more advanced tools ([ARCitect](/nfdi4plants.knowledgebase/arcitect/)) now bring their own git installation, there might still occur interferences with older installations
- There might also be issues of tools (e.g. [ARCitect](/nfdi4plants.knowledgebase/arcitect/) and [ARC commander](/nfdi4plants.knowledgebase/arc-commander/)) or different versions of those tools handling git-related tasks a bit differently or more / less strict (e.g. things like `main` as the default branch)
- The current (versions of) tools were not really built for collaboration with many people on one ARC (at least not with default settings from DataHUB side). So common errors are related to merge conflicts (multiple users changing files) and divergent branches (e.g. between local and remote clones of the ARC).
- Some behaviors are simply very use-case or setup specific and will in any case and even with the best tooling require some stewardship

Expand All @@ -34,6 +34,7 @@ Some reasons, why we now sometimes run into git issues
- On macOS: right-click ARC folder-->"Services"--> "New Terminal at Folder"
- On windows: open folder via Explorer; type "cmd" or "powershell" into the address field on top of Explorer
- On linux / macOS terminal: `cd path/to/ARC`
- From inside ARCitect: Tools -> Command Window

3. try some of the git commands and debugging below

Expand Down Expand Up @@ -266,7 +267,7 @@ It usually helps to just retrieve new ones. If not, you might have to remove exi

#### Authenticate the computer

Option 1: [via ARC Commander](/nfdi4plants.knowledgebase/arc-commander/access)
Option 1: [via ARC Commander](/nfdi4plants.knowledgebase/arc-commander/setup/access)

Option 2: "by hand"
1. Login to the [DataHUB](https://git.nfdi4plants.org/)
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/git/git-working-with-branches.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ import ARCitectBranches from '../arcitect/arcitect-branches.mdx'

## ARC Commander

import ARCCommanderBranches from '../arc-commander/branches.mdx'
import ARCCommanderBranches from '../arc-commander/central-functions/branches.mdx'

<ARCCommanderBranches />
4 changes: 2 additions & 2 deletions src/content/docs/vault/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ Why do I get the error `'arc' is not recognized as an internal or external comma

Your machine cannot find your ARC commander executable. Possible reasons are that you have not yet installed the ARC commander or that the `arc` executable was not added to your path.

Please carefully retry the [ARC Commander setup](/nfdi4plants.knowledgebase/arc-commander/installation).
Please carefully retry the [ARC Commander setup](/nfdi4plants.knowledgebase/arc-commander/setup/installation).

If this does not do the trick, please follow these steps towards debugging (on Windows):

1. Open the command prompt (cmd) or powershell in the folder (e.g. `C:\Programs\ArcCommander`) where you stored the ARC Commander program (e.g. arc.exe). If `arc --version` shows the version, the executable is intact.
2. Next, execute `path` to check wether the folder (e.g. `C:\Programs\ArcCommander`) appears in your path.
3. Adapt the user's path (not admin)

:bulb: If you do not have admin rights on the computer, please open the settings "Edit environment variables for your account" and follow steps described in the [ARC Commander setup](/nfdi4plants.knowledgebase/arc-commander/installation).
:bulb: If you do not have admin rights on the computer, please open the settings "Edit environment variables for your account" and follow steps described in the [ARC Commander setup](/nfdi4plants.knowledgebase/arc-commander/setup/installation).

</details>

Expand Down

0 comments on commit 02a127e

Please sign in to comment.