Skip to content

Commit c1f8fd1

Browse files
authored
Disable the "Delivery" item in the navbar so we can release (#1034)
* Disable the "Delivery" item in the navbar so we can release - This is a hack. That we can remove post-release and in the future we should implement a better feature-flagging system * Move REACT_APP_DISABLE_PROGRESSIVE_DELIVERY up to only run in ci - to cause less disruption - if it works okay we can move to release
1 parent dd41483 commit c1f8fd1

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
NODE_MODULES_CACHE_NAME: cache-node-modules
2525
NODE_VERSION: "14"
2626
HELM_REPO: ${{ inputs.helmrepo }}
27+
REACT_APP_DISABLE_PROGRESSIVE_DELIVERY: "true"
2728

2829
jobs:
2930
helm-chart:

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ ui-cra/.uptodate: ui-cra/*
5757
--build-arg=version=$(WEAVE_GITOPS_VERSION) \
5858
--build-arg=revision=$(GIT_REVISION) \
5959
--build-arg=GITHUB_TOKEN=$(GITHUB_BUILD_TOKEN) \
60+
--build-arg=REACT_APP_DISABLE_PROGRESSIVE_DELIVERY=$(REACT_APP_DISABLE_PROGRESSIVE_DELIVERY) \
6061
--build-arg=now=$(TIME_NOW) \
6162
--tag $(UI_SERVER) \
6263
$(@D)/

ui-cra/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ COPY --chown=node:node .npmrc /home/node
66
COPY --chown=node:node yarn.lock /home/node
77
COPY --chown=node:node Makefile /home/node
88

9+
ARG REACT_APP_DISABLE_PROGRESSIVE_DELIVERY
910
ARG GITHUB_TOKEN
1011
RUN make node_modules
1112

ui-cra/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ node_modules: package.json yarn.lock
44
yarn config set network-timeout 300000 && yarn install --prod --frozen-lockfile
55

66
build: node_modules $(shell find src -type f)
7-
REACT_APP_VERSION="$(CALENDAR_VERSION) $(VERSION)" yarn build
7+
REACT_APP_DISABLE_PROGRESSIVE_DELIVERY="$(REACT_APP_DISABLE_PROGRESSIVE_DELIVERY)" REACT_APP_VERSION="$(CALENDAR_VERSION) $(VERSION)" yarn build
88

99
core-lib:
1010
rm -rf node_modules/@weaveworks/weave-gitops/

ui-cra/src/components/Navigation.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,11 @@ export const Navigation: FC = () => {
108108
<NavItem className={classes.subItem} to={V2Routes.Sources}>
109109
Sources
110110
</NavItem>
111+
{process.env.REACT_APP_DISABLE_PROGRESSIVE_DELIVERY !== 'true' && (
111112
<NavItem className={classes.subItem} to="/applications/delivery">
112113
Delivery
113114
</NavItem>
115+
)}
114116
<NavItem to={V2Routes.FluxRuntime}>Flux Runtime</NavItem>
115117
</Box>
116118
<Box className={classes.section}>

0 commit comments

Comments
 (0)