Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit c589a9f

Browse files
committed
remove horizontal scrolling
1 parent 1c0e193 commit c589a9f

File tree

3 files changed

+43
-17
lines changed

3 files changed

+43
-17
lines changed

src/__tests__/__snapshots__/storybook.test.ts.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,12 +328,13 @@ exports[`Storyshots Filesystem default 1`] = `
328328
className="overflow-auto flex-grow-1"
329329
>
330330
<div
331-
className="row"
331+
className="m-0 row"
332332
>
333333
<div
334334
className="text-center col"
335335
>
336-
Nothing to see here.
336+
337+
Nothing to see here.
337338
</div>
338339
</div>
339340
</div>

src/components/pages/filesytem/FileList.tsx

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ function FileList(props: Props): ReactElement {
5959
const [sortedBy, setSortedBy] = useState<keyof FsEntity | null>(null);
6060
const [sortIncreasing, setSortIncreasing] = useState<boolean>(false);
6161
const allAreSelected =
62-
filesAndFolders?.length === props.filesystem.selectedFsEntities.length &&
62+
filesAndFolders?.length ===
63+
props.filesystem.selectedFsEntities.length &&
6364
!!filesAndFolders?.length;
6465

6566
const clearSelected = props.clearSelected;
@@ -77,7 +78,9 @@ function FileList(props: Props): ReactElement {
7778
...response.data.filter(
7879
(fsEntity: FsEntity) => fsEntity.type === "FOLDER"
7980
),
80-
...response.data.filter((fsEntity: FsEntity) => fsEntity.type !== "FOLDER")
81+
...response.data.filter(
82+
(fsEntity: FsEntity) => fsEntity.type !== "FOLDER"
83+
)
8184
]);
8285
setError("");
8386
setCurrentFsItemId(response.headers["x-ff-current"]);
@@ -119,7 +122,9 @@ function FileList(props: Props): ReactElement {
119122
setSortIncreasing(true);
120123
}
121124

122-
function getSortingFunction(property: keyof FsEntity): (a: any, b: any) => number {
125+
function getSortingFunction(
126+
property: keyof FsEntity
127+
): (a: any, b: any) => number {
123128
switch (property) {
124129
case "lastUpdatedBy":
125130
case "size":
@@ -130,19 +135,27 @@ function FileList(props: Props): ReactElement {
130135
case "name":
131136
case "type":
132137
return (a: any, b: any) =>
133-
a[property].toLowerCase().localeCompare(b[property].toLowerCase()) === 0
138+
a[property]
139+
.toLowerCase()
140+
.localeCompare(b[property].toLowerCase()) === 0
134141
? a.fileSystemId - b.fileSystemId
135-
: a[property].toLowerCase().localeCompare(b[property].toLowerCase());
142+
: a[property]
143+
.toLowerCase()
144+
.localeCompare(b[property].toLowerCase());
136145
case "lastUpdated":
137146
default:
138147
return (a: any, b: any) =>
139148
a.lastUpdatedBy.username
140149
.toLowerCase()
141-
.localeCompare(b.lastUpdatedBy.username.toLowerCase()) === 0
150+
.localeCompare(
151+
b.lastUpdatedBy.username.toLowerCase()
152+
) === 0
142153
? a.fileSystemId - b.fileSystemId
143154
: a.lastUpdatedBy.username
144-
.toLowerCase()
145-
.localeCompare(b.lastUpdatedBy.username.toLowerCase());
155+
.toLowerCase()
156+
.localeCompare(
157+
b.lastUpdatedBy.username.toLowerCase()
158+
);
146159
}
147160
}
148161

@@ -188,10 +201,18 @@ function FileList(props: Props): ReactElement {
188201
<Col xs={6} md={4} onClick={() => handleSortClick("name")}>
189202
{"Name"}
190203
</Col>
191-
<Col xs={6} md={3} onClick={() => handleSortClick("lastUpdatedBy")}>
204+
<Col
205+
xs={6}
206+
md={3}
207+
onClick={() => handleSortClick("lastUpdatedBy")}
208+
>
192209
Last updated by
193210
</Col>
194-
<Col xs={3} md={1} onClick={() => handleSortClick("lastUpdated")}>
211+
<Col
212+
xs={3}
213+
md={1}
214+
onClick={() => handleSortClick("lastUpdated")}
215+
>
195216
{"Last changes"}
196217
</Col>
197218
<Col xs={3} md={1} onClick={() => handleSortClick("size")}>
@@ -201,19 +222,25 @@ function FileList(props: Props): ReactElement {
201222
</div>
202223
<div className="overflow-auto flex-grow-1">
203224
{/*Table Body*/}
204-
<Row>
225+
<Row className="m-0">
205226
{error ? (
206227
<Col className={"text-center"}> {error}</Col>
207228
) : filesAndFolders?.length === 0 ? (
208-
<Col className={"text-center"}> Nothing to see here.</Col>
229+
<Col className={"text-center"}>
230+
{" "}
231+
Nothing to see here.
232+
</Col>
209233
) : (
210234
!filesAndFolders && <FFLoading />
211235
)}
212236

213237
{filesAndFolders?.map((folder: FsEntity) => {
214238
return (
215239
<React.Fragment key={folder.fileSystemId}>
216-
<FileListItem setPath={setPath} fileListItem={folder} />
240+
<FileListItem
241+
setPath={setPath}
242+
fileListItem={folder}
243+
/>
217244
<Col xs={12} className="border-top my-2" />
218245
</React.Fragment>
219246
);

src/components/pages/filesytem/Filesystem.stories.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import folderContentMock from "./__tests__/folderContentMock.json";
1313
const API_REQUEST = hostname + filesystemPath + "contents";
1414

1515
storiesOf("Filesystem", module).add("default", () => {
16-
// @ts-ignore
17-
1816
const mock = new MockAdapter(axios);
1917
mock.onGet(API_REQUEST).reply(200, folderContentMock, {
2018
"x-ff-current": "3"

0 commit comments

Comments
 (0)