Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xpub-faraday
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
xpub
xpub-faraday
Commits
3c28fcf6
Commit
3c28fcf6
authored
6 years ago
by
Bogdan Cochior
Browse files
Options
Downloads
Patches
Plain Diff
feat(manuscriptCard): hide customId if it's missing
parent
c25bc0ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!58
Sprint #20 - Goal - Reviewers submit report
,
!45
Hide manuscript ID on dashboard and thank you page until EQS approval
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/component-faraday-ui/src/ManuscriptCard.js
+1
-1
1 addition, 1 deletion
packages/component-faraday-ui/src/ManuscriptCard.js
scripts/wait-for-it.sh
+178
-0
178 additions, 0 deletions
scripts/wait-for-it.sh
with
179 additions
and
1 deletion
packages/component-faraday-ui/src/ManuscriptCard.js
+
1
−
1
View file @
3c28fcf6
...
...
@@ -52,7 +52,7 @@ const ManuscriptCard = ({
<
/Row
>
)}
<
Row
alignItems
=
"
center
"
justify
=
"
flex-start
"
mb
=
{
1
}
>
<
Text
customId
mr
=
{
1
}
>
{
`ID
${
customId
}
`
}
<
/Text
>
{
customId
&&
<
Text
customId
mr
=
{
1
}
>
{
`ID
${
customId
}
`
}
<
/Text>
}
{
submitted
&&
(
<
DateParser
humanizeThreshold
=
{
0
}
timestamp
=
{
submitted
}
>
{
timestamp
=>
<
Text
mr
=
{
3
}
>
Submitted
on
{
timestamp
}
<
/Text>
}
...
...
This diff is collapsed.
Click to expand it.
scripts/wait-for-it.sh
0 → 100755
+
178
−
0
View file @
3c28fcf6
#!/usr/bin/env bash
# Use this script to test if a given TCP host/port are available
cmdname
=
$(
basename
$0
)
echoerr
()
{
if
[[
$QUIET
-ne
1
]]
;
then
echo
"
$@
"
1>&2
;
fi
}
usage
()
{
cat
<<
USAGE
>&2
Usage:
$cmdname
host:port [-s] [-t timeout] [-- command args]
-h HOST | --host=HOST Host or IP under test
-p PORT | --port=PORT TCP port under test
Alternatively, you specify the host and port as host:port
-s | --strict Only execute subcommand if the test succeeds
-q | --quiet Don't output any status messages
-t TIMEOUT | --timeout=TIMEOUT
Timeout in seconds, zero for no timeout
-- COMMAND ARGS Execute command with args after the test finishes
USAGE
exit
1
}
wait_for
()
{
if
[[
$TIMEOUT
-gt
0
]]
;
then
echoerr
"
$cmdname
: waiting
$TIMEOUT
seconds for
$HOST
:
$PORT
"
else
echoerr
"
$cmdname
: waiting for
$HOST
:
$PORT
without a timeout"
fi
start_ts
=
$(
date
+%s
)
while
:
do
if
[[
$ISBUSY
-eq
1
]]
;
then
nc
-z
$HOST
$PORT
result
=
$?
else
(
echo
>
/dev/tcp/
$HOST
/
$PORT
)
>
/dev/null 2>&1
result
=
$?
fi
if
[[
$result
-eq
0
]]
;
then
end_ts
=
$(
date
+%s
)
echoerr
"
$cmdname
:
$HOST
:
$PORT
is available after
$((
end_ts
-
start_ts
))
seconds"
break
fi
sleep
1
done
return
$result
}
wait_for_wrapper
()
{
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
if
[[
$QUIET
-eq
1
]]
;
then
timeout
$BUSYTIMEFLAG
$TIMEOUT
$0
--quiet
--child
--host
=
$HOST
--port
=
$PORT
--timeout
=
$TIMEOUT
&
else
timeout
$BUSYTIMEFLAG
$TIMEOUT
$0
--child
--host
=
$HOST
--port
=
$PORT
--timeout
=
$TIMEOUT
&
fi
PID
=
$!
trap
"kill -INT -
$PID
"
INT
wait
$PID
RESULT
=
$?
if
[[
$RESULT
-ne
0
]]
;
then
echoerr
"
$cmdname
: timeout occurred after waiting
$TIMEOUT
seconds for
$HOST
:
$PORT
"
fi
return
$RESULT
}
# process arguments
while
[[
$#
-gt
0
]]
do
case
"
$1
"
in
*
:
*
)
hostport
=(
${
1
//
:/
}
)
HOST
=
${
hostport
[0]
}
PORT
=
${
hostport
[1]
}
shift
1
;;
--child
)
CHILD
=
1
shift
1
;;
-q
|
--quiet
)
QUIET
=
1
shift
1
;;
-s
|
--strict
)
STRICT
=
1
shift
1
;;
-h
)
HOST
=
"
$2
"
if
[[
$HOST
==
""
]]
;
then
break
;
fi
shift
2
;;
--host
=
*
)
HOST
=
"
${
1
#*=
}
"
shift
1
;;
-p
)
PORT
=
"
$2
"
if
[[
$PORT
==
""
]]
;
then
break
;
fi
shift
2
;;
--port
=
*
)
PORT
=
"
${
1
#*=
}
"
shift
1
;;
-t
)
TIMEOUT
=
"
$2
"
if
[[
$TIMEOUT
==
""
]]
;
then
break
;
fi
shift
2
;;
--timeout
=
*
)
TIMEOUT
=
"
${
1
#*=
}
"
shift
1
;;
--
)
shift
CLI
=(
"
$@
"
)
break
;;
--help
)
usage
;;
*
)
echoerr
"Unknown argument:
$1
"
usage
;;
esac
done
if
[[
"
$HOST
"
==
""
||
"
$PORT
"
==
""
]]
;
then
echoerr
"Error: you need to provide a host and port to test."
usage
fi
TIMEOUT
=
${
TIMEOUT
:-
15
}
STRICT
=
${
STRICT
:-
0
}
CHILD
=
${
CHILD
:-
0
}
QUIET
=
${
QUIET
:-
0
}
# check to see if timeout is from busybox?
# check to see if timeout is from busybox?
TIMEOUT_PATH
=
$(
realpath
$(
which
timeout
))
if
[[
$TIMEOUT_PATH
=
~
"busybox"
]]
;
then
ISBUSY
=
1
BUSYTIMEFLAG
=
"-t"
else
ISBUSY
=
0
BUSYTIMEFLAG
=
""
fi
if
[[
$CHILD
-gt
0
]]
;
then
wait_for
RESULT
=
$?
exit
$RESULT
else
if
[[
$TIMEOUT
-gt
0
]]
;
then
wait_for_wrapper
RESULT
=
$?
else
wait_for
RESULT
=
$?
fi
fi
if
[[
$CLI
!=
""
]]
;
then
if
[[
$RESULT
-ne
0
&&
$STRICT
-eq
1
]]
;
then
echoerr
"
$cmdname
: strict mode, refusing to execute subprocess"
exit
$RESULT
fi
exec
"
${
CLI
[@]
}
"
else
exit
$RESULT
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment