Skip to content

Commit 0b74fc7

Browse files
authored
Merge pull request #53 from FlowTestAI/minor-improvements
Improved warning message and don't display subheader (open/import) in…
2 parents 7ba0295 + 1ad259e commit 0b74fc7

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/components/molecules/headers/WorkspaceContentHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const WorkspaceContentHeader = () => {
3333
</div>
3434
</>
3535
) : (
36-
<div className='text-base tracking-[0.15em]'>Please select a Flow test or create a new one</div>
36+
<div className='text-base tracking-[0.15em]'>Please select a Flow or create a new one</div>
3737
)}
3838
</div>
3939
);

src/components/molecules/sidebar/content/Collections.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ const Collections = ({ collections }) => {
1616
const [selectedCollectionId, setSelectedCollectionId] = useState('');
1717
const [selectedItemType, setSelectedItemType] = useState('');
1818

19-
const messageForConfirmActionModal = `Do you wish to delete ${selectedItemType}`;
19+
const messageForConfirmActionModal =
20+
selectedItemType === OBJ_TYPES.collection
21+
? `Do you wish to remove this collection? This action does not delete from disk so you can open this collection again`
22+
: `Do you wish to delete this ${selectedItemType}? This action deletes it from disk and cannot be undone`;
2023

2124
const handleDeleteMenuItem = (menuItemType, path, collectionId) => {
2225
if (menuItemType === OBJ_TYPES.collection) {
@@ -65,6 +68,8 @@ const Collections = ({ collections }) => {
6568
const pathName = clickFromElementDataSet?.pathName;
6669
const collectionId = clickFromElementDataSet?.collectionId;
6770

71+
console.log(clickFromElementDataSet);
72+
6873
setSelectedPathName(pathName);
6974
setSelectedCollectionId(collectionId);
7075
setSelectedMenuItem(optionsMenuItem);

src/components/molecules/sidebar/content/Environment.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const Environment = ({ collectionId, collection }) => {
1111
const [confirmActionModalOpen, setConfirmActionModalOpen] = useState(false);
1212
const [envToDelete, setEnvToDelete] = useState('');
1313

14-
const messageForConfirmActionModal = 'Do you wish to delete this environment';
14+
const messageForConfirmActionModal =
15+
'Do you wish to delete this environment? This action deletes it from disk and cannot be undone';
1516

1617
return (
1718
<>

src/components/molecules/sidebar/content/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const Content = ({ collections }) => {
1010
const navigationSelectedValue = useNavigationStore((state) => state.selectedNavVal);
1111
return (
1212
<>
13-
<SideBarSubHeader />
1413
{navigationSelectedValue === AppNavBarItems.collections.value ? (
15-
<Collections collections={collections} />
14+
<>
15+
<SideBarSubHeader />
16+
<Collections collections={collections} />
17+
</>
1618
) : (
1719
<Environments collections={collections} />
1820
)}

0 commit comments

Comments
 (0)