From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 10:50:09 2019 Received: (at submit) by debbugs.gnu.org; 31 Jul 2019 14:50:09 +0000 Received: from localhost ([127.0.0.1]:52873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hspvc-0001g4-Qm for submit@debbugs.gnu.org; Wed, 31 Jul 2019 10:50:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:34559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hspvZ-0001fv-D0 for submit@debbugs.gnu.org; Wed, 31 Jul 2019 10:50:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46666) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hspvY-00059v-4C for guix-patches@gnu.org; Wed, 31 Jul 2019 10:50:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hspvW-0006hW-TK for guix-patches@gnu.org; Wed, 31 Jul 2019 10:50:04 -0400 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]:49192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hspvW-0006gY-JM for guix-patches@gnu.org; Wed, 31 Jul 2019 10:50:02 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id C85D252254; Wed, 31 Jul 2019 16:50:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id gqiDAs09-aZX; Wed, 31 Jul 2019 16:49:54 +0200 (CEST) From: Robert Vollmert To: guix-patches@gnu.org Subject: [PATCH] Fix templates to handle all statuses. Date: Wed, 31 Jul 2019 16:48:50 +0200 Message-Id: <20190731144850.4870-1-rob@vllmrt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:67c:2050:104:0:1:25:1 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Robert Vollmert X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * src/cuirass/templates.scm: Factor out class and title helpers for build statuses, and handle all the statuses. --- src/cuirass/templates.scm | 109 ++++++++++++-------------------------- 1 file changed, 33 insertions(+), 76 deletions(-) diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm index ab1b85c..84097f0 100644 --- a/src/cuirass/templates.scm +++ b/src/cuirass/templates.scm @@ -103,6 +103,28 @@ ,body (hr))))) =20 +(define (status-class status) + (cond + ((=3D (build-status scheduled) status) "oi oi-clock = text-warning") + ((=3D (build-status started) status) "oi oi-reload = text-warning") + ((=3D (build-status succeeded) status) "oi oi-check = text-success") + ((=3D (build-status failed) status) "oi oi-x = text-danger") + ((=3D (build-status failed-dependency) status) "oi oi-warning = text-danger") + ((=3D (build-status failed-other) status) "oi oi-warning = text-danger") + ((=3D (build-status canceled) status) "oi oi-question-mark = text-warning") + (else "oi oi-warning te= xt-danger"))) + +(define (status-title status) + (cond + ((=3D (build-status scheduled) status) "Scheduled") + ((=3D (build-status started) status) "Started") + ((=3D (build-status succeeded) status) "Succeeded") + ((=3D (build-status failed) status) "Failed") + ((=3D (build-status failed-dependency) status) "Failed (dependency)"= ) + ((=3D (build-status failed-other) status) "Failed (other)") + ((=3D (build-status canceled) status) "Canceled") + (else "Invalid status"))) + (define (specifications-table specs) "Return HTML for the SPECS table." `((p (@ (class "lead")) "Specifications") @@ -128,29 +150,6 @@ (define (build-details build) "Return HTML showing details for the BUILD." (define status (assq-ref build #:status)) - (define display-status - (cond - ((=3D (build-status succeeded) status) - `(span (@ (class "oi oi-check text-success") - (title "Succeeded")) - " Success")) - ((=3D (build-status scheduled) status) - `(span (@ (class "oi oi-clock text-warning") - (title "Scheduled") - (aria-hidden "true")) - " Scheduled")) - ((=3D (build-status canceled) status) - `(span (@ (class "oi oi-question-mark text-warning") - (title "Canceled")) - " Canceled")) - ((=3D (build-status failed-dependency) status) - `(span (@ (class "oi oi-warning text-danger") - (title "Dependency failed")) - " Dependency failed")) - (else - `(span (@ (class "oi oi-x text-danger") - (title "Failed")) - " Failed")))) (define blocking-outputs (or (and-let* (((=3D (build-status failed-dependency) status)) (drv (false-if-exception @@ -172,7 +171,9 @@ (tr (th "Build ID") (td ,(assq-ref build #:id))) (tr (th "Status") - (td ,display-status + (td (span (@ (class ,(status-class status)) + (title ,(status-title status))) + ,(string-append " " (status-title status))) ,@(map (lambda (output) `((br) (a (@ (href ,(string-append "/log/" (basename o= utput)))) @@ -361,32 +362,10 @@ and BUILD-MAX are global minimal and maximal (stopt= ime, rowid) pairs." (=3D (build-status failed) status))) =20 `(tr - (td ,(cond - ((=3D (build-status succeeded) status) - `(span (@ (class "oi oi-check text-success") - (title "Succeeded") - (aria-hidden "true")) - "")) - ((=3D (build-status scheduled) status) - `(span (@ (class "oi oi-clock text-warning") - (title "Scheduled") - (aria-hidden "true")) - "")) - ((=3D (build-status canceled) status) - `(span (@ (class "oi oi-question-mark text-warning") - (title "Canceled") - (aria-hidden "true")) - "")) - ((=3D (build-status failed-dependency) status) - `(span (@ (class "oi oi-warning text-danger") - (title "Dependency failed") - (aria-hidden "true")) - "")) - (else - `(span (@ (class "oi oi-x text-danger") - (title "Failed") - (aria-hidden "true")) - "")))) + (td (span (@ (class ,(status-class status)) + (title ,(status-title status)) + (aria-hidden "true")) + "")) (th (@ (scope "row")) (a (@ (href "/build/" ,(assq-ref build #:id) "/details")) ,(assq-ref build #:id))) @@ -474,32 +453,10 @@ and BUILD-MAX are global minimal and maximal row id= entifiers." (=3D (build-status failed) status))) =20 `(tr - (td ,(cond - ((=3D (build-status succeeded) status) - `(span (@ (class "oi oi-check text-success") - (title "Succeeded") - (aria-hidden "true")) - "")) - ((=3D (build-status scheduled) status) - `(span (@ (class "oi oi-clock text-warning") - (title "Scheduled") - (aria-hidden "true")) - "")) - ((=3D (build-status canceled) status) - `(span (@ (class "oi oi-question-mark text-warning") - (title "Canceled") - (aria-hidden "true")) - "")) - ((=3D (build-status failed-dependency) status) - `(span (@ (class "oi oi-warning text-danger") - (title "Dependency failed") - (aria-hidden "true")) - "")) - (else - `(span (@ (class "oi oi-x text-danger") - (title "Failed") - (aria-hidden "true")) - "")))) + (td (span (@ (class ,(status-class status)) + (title ,(status-title status)) + (aria-hidden "true")) + "")) (th (@ (scope "row")) (a (@ (href "/build/" ,(assq-ref build #:id) "/details")) ,(assq-ref build #:id))) --=20 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 10:21:19 2019 Received: (at 36874-done) by debbugs.gnu.org; 7 Aug 2019 14:21:19 +0000 Received: from localhost ([127.0.0.1]:39170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvMoZ-0003CB-Eu for submit@debbugs.gnu.org; Wed, 07 Aug 2019 10:21:19 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvMoX-0003C1-8v for 36874-done@debbugs.gnu.org; Wed, 07 Aug 2019 10:21:18 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1565187675; cv=none; d=zoho.com; s=zohoarc; b=YzlxVXl8ZSunV43lawF/YK7kMJG3fQCvV/YkfGtRMozzGyZpCuOtJ1H/KNmIu08KMGjnUvUOYNhYDwXnjFWiWcqArzGU+S9uY2fGNWp2zJKOoLL7kU7Qz4h768nJDw/fJzwp+l48JkzPH0J3MbuQPj4XGQkFs0YyK6hoaelB5gA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565187675; h=Content-Type:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=9YAdv72TVElmL9WcnaWKVs4kh08W28aMNUINOo4b7uA=; b=PucOG+Dsk16Ht6keoL0Om7uyVcMP3qPQ+RUmyZL1kfeKhY0hmmuoeTTMlPh38/CKWDsh/YCQeisuSaxZRbx4q3GebS6shdR1yHPHc4v78/eBRUbnOhZdPQrqtyImev6+4DbnIK4oargvXCdAnBUSR+mtKdbbiqxEK+uc7Q1r5bU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1565187675; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type; l=197; bh=9YAdv72TVElmL9WcnaWKVs4kh08W28aMNUINOo4b7uA=; b=KULm7UDjs8aEH6lkpvgeeOPGp3E4/drHm5XJV2oLt7tqNnCfO5hmYGHF24iA21Bu u4PLf3OFuvf1bsZlEMNGHBwpf9xUTZgiHmgBmFRy10PEQEaD/dlC3QqJYA8TwNfgBQ1 Ev5RIQgBZDQxVbXAbbAaGjaFNaJCAFNizNbBLNHQ= Received: from localhost (141.80.247.250 [141.80.247.250]) by mx.zohomail.com with SMTPS id 1565187674331549.4559538864573; Wed, 7 Aug 2019 07:21:14 -0700 (PDT) References: <20190731144850.4870-1-rob@vllmrt.net> User-agent: mu4e 1.2.0; emacs 26.2 From: Ricardo Wurmus To: Robert Vollmert Subject: Re: [bug#36874] [PATCH] Fix templates to handle all statuses. In-reply-to: <20190731144850.4870-1-rob@vllmrt.net> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 07 Aug 2019 16:21:09 +0200 Message-ID: <87ftmdxdii.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 36874-done Cc: 36874-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Robert, > * src/cuirass/templates.scm: Factor out class and title helpers > for build statuses, and handle all the statuses. Applied! Thank you and sorry for the delay. -- Ricardo From unknown Sun Jun 22 11:39:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 05 Sep 2019 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator