Merge branch 'master' into production

requestly · Jun 5, 2024 · bd021b0 · bd021b0
2 parents 47227a8 + 58d7555
commit bd021b0
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 18 deletions.
diff --git a/app/src/componentsV2/ContentList/components/ContentListTable/contentListTable.scss b/app/src/componentsV2/ContentList/components/ContentListTable/contentListTable.scss
@@ -1,6 +1,8 @@
 .rq-content-list-table-container {
   background-color: var(--requestly-color-background);
   margin: 16px 16px;
+  width: 100%;
+  max-width: 1920px;
 
   .rq-content-list-table {
     background-color: inherit;

diff --git a/app/src/features/mocks/screens/mocksList/components/MocksList/mocksList.scss b/app/src/features/mocks/screens/mocksList/components/MocksList/mocksList.scss
@@ -12,3 +12,10 @@
     }
   }
 }
+
+.mocks-table-container {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 0 1rem;
+}
diff --git a/...eatures/rules/screens/rulesList/components/RulesList/components/RulesTable/rulesTable.css b/...eatures/rules/screens/rulesList/components/RulesList/components/RulesTable/rulesTable.css
@@ -168,13 +168,3 @@
 tr.rq-content-list-table-row.ant-table-row:hover .group-name-container .add-rule-btn {
   display: flex;
 }
-
-.rq-rules-table
-  .rq-content-list-table-container
-  .rules-list-table.rq-content-list-table
-  tbody
-  tr.ant-table-row-level-1
-  td
-  .rule-name-container {
-  padding-left: 14px;
-}
diff --git a/app/src/features/rules/screens/rulesList/components/RulesList/rulesList.scss b/app/src/features/rules/screens/rulesList/components/RulesList/rulesList.scss
@@ -18,9 +18,4 @@
   display: flex;
   justify-content: center;
   padding: 0 1rem;
-
-  .rq-content-list-table-container {
-    width: 100%;
-    max-width: 1200px;
-  }
 }
diff --git a/...s/rules/screens/sharedListViewer/components/SharedListViewerList/SharedListViewerList.tsx b/...s/rules/screens/sharedListViewer/components/SharedListViewerList/SharedListViewerList.tsx
@@ -35,10 +35,10 @@ export const SharedListViewerList: React.FC<Props> = ({ records, recordsMap, isL
     const enhancedRecords = enhanceRecords(records, recordsMap);
     const contentTableAdaptedRecords = recordsToContentTableDataAdapter(enhancedRecords);
     setContentListTableData(contentTableAdaptedRecords);
-  }, [records, recordsMap, setContentListTableData, enhanceRecords, recordsToContentTableDataAdapter]);
+  }, [records, recordsMap, setContentListTableData]);
 
   return (
-    <>
+    <div className="shared-list-viewer-table-container">
       <ContentListTable
         columns={columns}
         data={contentListTableData}
@@ -61,6 +61,6 @@ export const SharedListViewerList: React.FC<Props> = ({ records, recordsMap, isL
           }}
         />
       )}
-    </>
+    </div>
   );
 };
diff --git a/.../rules/screens/sharedListViewer/components/SharedListViewerList/sharedListViewerList.scss b/.../rules/screens/sharedListViewer/components/SharedListViewerList/sharedListViewerList.scss
@@ -1,3 +1,10 @@
+.shared-list-viewer-table-container {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 0 1rem;
+}
+
 .shared-list-viewer-record-name {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -33,4 +40,11 @@
       opacity: 1;
     }
   }
+
+  .rq-content-list-table-row.ant-table-row-level-0 {
+    .ant-table-cell-with-append {
+      display: flex;
+      gap: 8px;
+    }
+  }
 }
diff --git a/...eens/sharedLists/components/SharedLists/components/SharedListsTable/sharedListsTable.scss b/...eens/sharedLists/components/SharedLists/components/SharedListsTable/sharedListsTable.scss
@@ -1,4 +1,9 @@
 .sharedlists-table-container {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 0 1rem;
+
   .sharedlist-name {
     color: var(--link-color);
     cursor: pointer;

diff --git a/app/src/features/rules/screens/templatesList/components/TemplatesTable/templatesTable.scss b/app/src/features/rules/screens/templatesList/components/TemplatesTable/templatesTable.scss
@@ -1,4 +1,9 @@
 .rq-templates-table {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 0 1rem;
+
   .template-name {
     color: var(--link-color);
     cursor: pointer;