Skip to content

Commit 838e415

Browse files
committed
[dashboard] Fix spinner
1 parent b338a87 commit 838e415

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed
Lines changed: 1 addition & 1 deletion
Loading

components/dashboard/src/icons/SpinnerDark.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

components/dashboard/src/projects/ConfigureProject.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { getGitpodService } from "../service/service";
1313
import { getCurrentTeam, TeamsContext } from "../teams/teams-context";
1414
import Header from "../components/Header";
1515
import Spinner from "../icons/Spinner.svg";
16-
import SpinnerDark from "../icons/SpinnerDark.svg";
1716
import PrebuildLogsEmpty from "../images/prebuild-logs-empty.svg";
1817
import PrebuildLogsEmptyDark from "../images/prebuild-logs-empty-dark.svg";
1918
import { ThemeContext } from "../theme-context";
@@ -163,7 +162,7 @@ export default function () {
163162
<MonacoEditor classes="w-full flex-grow" disabled={isEditorDisabled} language="dockerfile" value={dockerfile} onChange={setDockerfile} />}
164163
</Suspense>
165164
{isDetecting && <div className="absolute h-full w-full bg-gray-100 dark:bg-gray-700 flex items-center justify-center space-x-2">
166-
<img className="h-5 w-5 animate-spin" src={isDark ? SpinnerDark : Spinner} />
165+
<img className="h-5 w-5 animate-spin" src={Spinner} />
167166
<span className="font-semibold text-gray-400">Detecting project configuration ...</span>
168167
</div>}
169168
</div>
@@ -177,7 +176,7 @@ export default function () {
177176
</div>)
178177
}</div>
179178
<div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
180-
{prebuildWasTriggered && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
179+
{prebuildWasTriggered && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} />}
181180
<div className="flex-grow" />
182181
{(prebuildInstance?.status.phase === "stopped" && !prebuildInstance?.status.conditions.failed)
183182
? <a className="my-auto" href={`/#${project?.cloneUrl}`}><button className="secondary">New Workspace</button></a>

components/dashboard/src/projects/Prebuild.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import Header from "../components/Header";
1212
import PrebuildLogs from "../components/PrebuildLogs";
1313
import { getGitpodService, gitpodHostUrl } from "../service/service";
1414
import { TeamsContext, getCurrentTeam } from "../teams/teams-context";
15-
import { ThemeContext } from "../theme-context";
1615
import { PrebuildInstanceStatus } from "./Prebuilds";
1716
import { shortCommitMessage } from "./render-utils";
1817

@@ -28,7 +27,6 @@ export default function () {
2827

2928
const [ prebuild, setPrebuild ] = useState<PrebuildWithStatus | undefined>();
3029
const [ prebuildInstance, setPrebuildInstance ] = useState<WorkspaceInstance | undefined>();
31-
const { isDark } = useContext(ThemeContext);
3230

3331
useEffect(() => {
3432
if (!teams || !projectName || !prebuildId) {
@@ -88,7 +86,7 @@ export default function () {
8886
<PrebuildLogs workspaceId={prebuild?.info?.buildWorkspaceId} onInstanceUpdate={onInstanceUpdate} />
8987
</div>
9088
<div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
91-
{prebuildInstance && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
89+
{prebuildInstance && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} />}
9290
<div className="flex-grow" />
9391
{prebuildInstance?.status.phase === "stopped"
9492
? <a className="my-auto" href={gitpodHostUrl.withContext(`${prebuild?.info.changeUrl}`).toString()}><button>New Workspace</button></a>

components/dashboard/src/projects/Prebuilds.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import Header from "../components/Header";
1212
import DropDown, { DropDownEntry } from "../components/DropDown";
1313
import { ItemsList, Item, ItemField, ItemFieldContextMenu } from "../components/ItemsList";
1414
import Spinner from "../icons/Spinner.svg";
15-
import SpinnerDark from "../icons/SpinnerDark.svg";
1615
import StatusDone from "../icons/StatusDone.svg";
1716
import StatusFailed from "../icons/StatusFailed.svg";
1817
import StatusPaused from "../icons/StatusPaused.svg";
@@ -233,7 +232,7 @@ export function prebuildStatusIcon(status: PrebuiltWorkspaceState | undefined) {
233232
}
234233
}
235234

236-
export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInstance, isDark?: boolean }) {
235+
export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInstance }) {
237236
let status = <></>;
238237
let details = <></>;
239238
switch (props.prebuildInstance?.status.phase) {
@@ -244,7 +243,7 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
244243
<span>PENDING</span>
245244
</div>;
246245
details = <div className="flex space-x-1 items-center text-gray-400">
247-
<img className="h-4 w-4 animate-spin" src={props.isDark ? SpinnerDark : Spinner} />
246+
<img className="h-4 w-4 animate-spin" src={Spinner} />
248247
<span>Prebuild in progress ...</span>
249248
</div>;
250249
break;
@@ -259,7 +258,7 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
259258
<span>RUNNING</span>
260259
</div>;
261260
details = <div className="flex space-x-1 items-center text-gray-400">
262-
<img className="h-4 w-4 animate-spin" src={props.isDark ? SpinnerDark : Spinner} />
261+
<img className="h-4 w-4 animate-spin" src={Spinner} />
263262
<span>Prebuild in progress ...</span>
264263
</div>;
265264
break;

0 commit comments

Comments
 (0)