feat: mark instances as public (#156)

* feat: mark instances as public * chore: run workflow form master
dhis2-sre · Jul 7, 2023 · a8c66f2 · a8c66f2
1 parent 2a89a2a
commit a8c66f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml
@@ -4,4 +4,4 @@ on: pull_request
 
 jobs:
  dependabot:
- uses: dhis2-sre/gha-workflows/.github/workflows/dependabot.yaml@v0.8.0
+ uses: dhis2-sre/gha-workflows/.github/workflows/dependabot.yaml@master
diff --git a/src/components/InstancesLists.tsx b/src/components/InstancesLists.tsx
@@ -9,6 +9,7 @@ import {
  DataTableToolbar as TableToolbar,
  Help,
  IconAdd24,
+ IconWorld24,
  Tag,
 } from '@dhis2/ui'
 import { useNavigate } from 'react-router-dom'
@@ -123,7 +124,7 @@ const InstancesList = () => {
  <DataTableCell>
  <Tag positive>Running</Tag>
  </DataTableCell>
- <DataTableCell>{instance.name}</DataTableCell>
+ <DataTableCell>{instance.name} {instance.public === true ? <IconWorld24/> : <></>}</DataTableCell>
  <DataTableCell>
  <Moment date={instance.createdAt} fromNow />
  </DataTableCell>

diff --git a/src/components/StackConfigurator.tsx b/src/components/StackConfigurator.tsx
@@ -1,4 +1,5 @@
-import { Divider, InputField, SingleSelectField, SingleSelectOption, TextAreaField } from '@dhis2/ui'
+import { CheckboxField, Divider, InputField, SingleSelectField, SingleSelectOption, TextAreaField } from '@dhis2/ui'
+import cx from 'classnames'
 import { getStack } from '../api/stacks'
 import { Stack } from '../types/stack'
 import { useApi } from '../api/useApi'
@@ -63,6 +64,7 @@ export const StackConfigurator = forwardRef(function StackConfigurator({ name: s
  const { data: groups, isLoading: isLoadingGroups } = useApi<Group[]>(getGroups)
  const [group, setGroup] = useState('')
  const [ttl, setTtl] = useState('')
+ const [publicity, setPublicity] = useState(false)
 
  useImperativeHandle(
  ref,
@@ -73,6 +75,7 @@ export const StackConfigurator = forwardRef(function StackConfigurator({ name: s
  description: description,
  groupName: group,
  ttl: ttlMap.get(ttl),
+ public: publicity,
  requiredParameters: toArray(requiredStackParameters),
  optionalParameters: toArray(optionalStackParameters),
  }
@@ -131,6 +134,7 @@ export const StackConfigurator = forwardRef(function StackConfigurator({ name: s
  <SingleSelectOption key={key} label={key} value={key} />
  ))}
  </SingleSelectField>
+ <CheckboxField className={cx(styles.field, styles.checkboxfield)} label="Public?" checked={publicity} onChange={({ checked }) => setPublicity(checked)} />
  </div>
 
  {requiredStackParameters && (

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -8,6 +8,7 @@ export type Instance = {
  groupName: string
  stackName: string
  ttl: number
+ public: boolean
  requiredParameters:
  | [
  {