Merge pull request #911 from factly/Label-inconsistencies

fix:form labels in pages and tags
factly · Jul 20, 2023 · f5fa2b9 · f5fa2b9
2 parents a2e44e1 + 6cae4eb
commit f5fa2b9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 29 deletions.
diff --git a/studio/src/components/List/index.js b/studio/src/components/List/index.js
@@ -175,14 +175,14 @@ function PostList({ actions, format, filters, onPagination, data, fetchPosts, qu
                 }}
                 disabled={!(actions.includes('admin') || actions.includes('delete'))}
               />
-              <Button
+              {/* <Button
                 size="large"
                 icon={<ThreeDotIcon style={{ color: '#858585' }} />}
                 onClick={(e) => {
                   e.stopPropagation();
                   alert('this do nothing');
                 }}
-              />
+              /> */}
             </div>
           </ConfigProvider>
         );

diff --git a/studio/src/pages/pages/components/PageList.js b/studio/src/pages/pages/components/PageList.js
@@ -141,35 +141,13 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
                 icon={<DeleteOutlined style={{ color: '#858585' }} />}
                 disabled={!(actions.includes('admin') || actions.includes('delete'))}
               />
-              <Button
+              {/* <Button
                 size="large"
                 icon={<ThreeDotIcon style={{ color: '#858585' }} />}
                 onClick={() => {
                   alert('this do nothing');
                 }}
-              />
-              <Modal
-                open={modalOpen}
-                closable={false}
-                centered
-                width={311}
-                className="delete-modal-container"
-                style={{
-                  borderRadius: '18px',
-                }}
-                onOk={() => {
-                  dispatch(deletePage(item.id)).then(() => fetchPages());
-                }}
-                cancelButtonProps={{ type: 'text', style: { color: '#000' } }}
-                onCancel={(e) => {
-                  e.stopPropagation();
-                  setModalOpen(false);
-                }}
-              >
-                <Typography.Text style={{ fontSize: '1rem', color: '#101828' }} strong>
-                  Are you sure you want to delete this page?
-                </Typography.Text>
-              </Modal>
+              /> */}
               {/* <Button
                   icon={<EditOutlined />}
                   disabled={!(actions.includes('admin') || actions.includes('update'))}

diff --git a/studio/src/pages/posts/components/PostForm.js b/studio/src/pages/posts/components/PostForm.js
@@ -170,7 +170,10 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
   }
 
   const createTemplate = () => {
-    dispatch(addTemplate({ post_id: parseInt(data.id) })).then(() => history.push('/posts'));
+    dispatch(addTemplate({ post_id: parseInt(data.id) })).then(() => {
+      page ? history.push('/pages')
+      : history.push('/posts')
+    });
   };
   const setReadyFlag = () => {
     status === 'ready' ? setStatus('draft') : setStatus('ready');
@@ -300,7 +303,7 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
               >
                 <Input.TextArea
                   bordered={false}
-                  placeholder="Add title for the post"
+                  placeholder={`Add title for the ${page ? "page" : "post"}`}
                   onChange={(e) => onTitleChange(e.target.value)}
                   style={{
                     fontSize: '2.5rem',

diff --git a/studio/src/pages/tags/components/TagForm.js b/studio/src/pages/tags/components/TagForm.js
@@ -94,7 +94,7 @@ const TagForm = ({ onCreate, data = {} }) => {
                     <Col xs={24} md={10}>
                       <TitleInput
                         name="name"
-                        label="Category Name"
+                        label="Tag Name"
                         onChange={(e) => onTitleChange(e.target.value)}
                       />
                       <SlugInput />