From a8c66f2404a926ba54b52674c456f9e2199cf26d Mon Sep 17 00:00:00 2001
From: tonsV2 <tonsV2@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:58:57 +0800
Subject: [PATCH] feat: mark instances as public (#156)

* feat: mark instances as public

* chore: run workflow form master
---
 .github/workflows/dependabot.yaml    | 2 +-
 src/components/InstancesLists.tsx    | 3 ++-
 src/components/StackConfigurator.tsx | 6 +++++-
 src/types/index.ts                   | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml
index df169684..354b721b 100644
--- 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
index 5795d296..7df371af 100644
--- 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
index 33c90c11..72aeea45 100644
--- 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
index a2faf546..3421b708 100644
--- 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:
         | [
               {