Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor Select loading spinner property #6556

Merged
merged 4 commits into from
Oct 18, 2022
Merged

refactor Select loading spinner property #6556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06ec13b
refactor Select loading spinner property
hotzenklotz Oct 14, 2022
1cbb641
Merge branch 'master' of github.com:scalableminds/webknossos into sel…
hotzenklotz Oct 18, 2022
52e0559
Merge branch 'master' of github.com:scalableminds/webknossos into sel…
hotzenklotz Oct 18, 2022
0e1cacc
fixed formatting
hotzenklotz Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/javascripts/admin/project/project_create_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Form, Input, Select, Button, Card, InputNumber, Checkbox, Spin } from "antd";
import { Form, Input, Select, Button, Card, InputNumber, Checkbox } from "antd";
import React, { useState, useEffect } from "react";
import { useHistory } from "react-router-dom";
import { useSelector } from "react-redux";
Expand Down Expand Up @@ -112,7 +112,7 @@ function ProjectCreateView({ projectId }: PropsWithRouter) {
optionFilterProp="label"
style={fullWidth}
disabled={isEditMode}
notFoundContent={isFetchingData ? <Spin size="small" /> : "No Data"}
loading={isFetchingData}
options={teams.map((team: APITeam) => ({
label: team.name,
value: team.id,
Expand All @@ -136,7 +136,7 @@ function ProjectCreateView({ projectId }: PropsWithRouter) {
optionFilterProp="label"
style={fullWidth}
disabled={isEditMode}
notFoundContent={isFetchingData ? <Spin size="small" /> : "No Data"}
loading={isFetchingData}
options={users.map((user: APIUser) => ({
label: `${user.lastName}, ${user.firstName} (${user.email})`,
value: user.id,
Expand Down
4 changes: 2 additions & 2 deletions frontend/javascripts/admin/scripts/script_create_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Form, Input, Select, Button, Card, Spin } from "antd";
import { Form, Input, Select, Button, Card } from "antd";
import type { RouteComponentProps } from "react-router-dom";
import { withRouter } from "react-router-dom";
import { connect } from "react-redux";
Expand Down Expand Up @@ -116,7 +116,7 @@ function ScriptCreateView({ scriptId, activeUser, history }: PropsWithRouter) {
style={{
width: "100%",
}}
notFoundContent={isFetchingData ? <Spin size="small" /> : "No Data"}
loading={isFetchingData}
options={users.map((user: APIUser) => ({
value: user.id,
label: `${user.lastName}, ${user.firstName} (${user.email})`,
Expand Down
8 changes: 4 additions & 4 deletions frontend/javascripts/admin/task/task_create_form_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ class TaskCreateFormView extends React.PureComponent<Props, State> {
disabled={
isEditingMode || this.state.specificationType === SpecificationEnum.BaseAnnotation
}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.datasets.map((dataset: APIDataset) => ({
label: dataset.name,
value: dataset.name,
Expand Down Expand Up @@ -577,7 +577,7 @@ class TaskCreateFormView extends React.PureComponent<Props, State> {
optionFilterProp="label"
style={fullWidth}
disabled={isEditingMode}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.taskTypes.map((taskType: APITaskType) => ({
value: taskType.id,
label: taskType.summary,
Expand Down Expand Up @@ -657,7 +657,7 @@ class TaskCreateFormView extends React.PureComponent<Props, State> {
optionFilterProp="label"
style={fullWidth}
disabled={isEditingMode}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.projects.map((project: APIProject) => ({
value: project.name,
label: project.name,
Expand All @@ -672,7 +672,7 @@ class TaskCreateFormView extends React.PureComponent<Props, State> {
optionFilterProp="label"
style={fullWidth}
disabled={isEditingMode}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.scripts.map((script: APIScript) => ({
value: script.id,
label: script.name,
Expand Down
8 changes: 4 additions & 4 deletions frontend/javascripts/admin/task/task_search_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Form, Row, Dropdown, Menu, Col, Button, Input, Select, Spin } from "antd";
import { Form, Row, Dropdown, Menu, Col, Button, Input, Select } from "antd";
import { FormInstance } from "antd/lib/form";
import { DownloadOutlined, DownOutlined, RetweetOutlined } from "@ant-design/icons";
// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module '@sca... Remove this comment to see the full error message
Expand Down Expand Up @@ -222,7 +222,7 @@ class TaskSearchForm extends React.Component<Props, State> {
style={{
width: "100%",
}}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.taskTypes.map((taskType: APITaskType) => ({
value: taskType.id,
label: `${taskType.summary}`,
Expand All @@ -242,7 +242,7 @@ class TaskSearchForm extends React.Component<Props, State> {
style={{
width: "100%",
}}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.projects.map((project: APIProject) => ({
value: project.id,
label: `${project.name}`,
Expand All @@ -260,7 +260,7 @@ class TaskSearchForm extends React.Component<Props, State> {
style={{
width: "100%",
}}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.users
.filter((u) => u.isActive)
.map((user: APIUser) => ({
Expand Down
3 changes: 1 addition & 2 deletions frontend/javascripts/admin/tasktype/task_type_create_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
Select,
InputNumber,
Tooltip,
Spin,
} from "antd";
import { syncValidator } from "types/validation";
import { FormInstance } from "antd/lib/form";
Expand Down Expand Up @@ -256,7 +255,7 @@ class TaskTypeCreateView extends React.PureComponent<Props, State> {
style={{
width: "100%",
}}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.teams.map((team: APITeam) => ({
value: team.id,
label: `${team.name}`,
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/admin/time/time_line_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class TimeLineView extends React.PureComponent<Props, State> {
width: "100%",
}}
onChange={this.handleUserChange}
notFoundContent={this.state.isFetchingUsers ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingUsers}
options={this.state.users
.filter((u) => u.isActive)
.map((user: APIUser) => ({
Expand Down
4 changes: 2 additions & 2 deletions frontend/javascripts/dashboard/dataset/team_selection_component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Select, Spin } from "antd";
import { Select } from "antd";
import * as React from "react";
import _ from "lodash";
import type { APITeam } from "types/api_flow_types";
Expand Down Expand Up @@ -96,7 +96,7 @@ class TeamSelectionComponent extends React.PureComponent<Props, State> {
value={this.state.selectedTeams.map((t) => t.id)}
filterOption
disabled={this.props.disabled ? this.props.disabled : false}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
>
{this.getAllTeams().map((team) => (
<Option
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/oxalis/view/action-bar/merge_modal_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class _MergeModalView extends PureComponent<Props, MergeModalViewState> {
width: 200,
}}
onChange={this.handleChangeMergeProject}
notFoundContent={this.state.isFetchingData ? <Spin size="small" /> : "No Data"}
loading={this.state.isFetchingData}
options={this.state.projects.map((project) => ({
value: project.id,
label: project.label,
Expand Down