diff --git a/.dockerignore b/.dockerignore index ed0abc3dfa..22d643db43 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,7 @@ build/ dist/ src/fidesctl.egg-info/ +src/ui-build/ # Ignore Python-Specific Files .mypy_cache/ diff --git a/.gitignore b/.gitignore index 98e6d4280e..85520d2b05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ docs/fides/docs/api/openapi.json docs/fides/docs/schemas/config_schema.json -fidesctl/api/ctl/build/static +ui-build/ ## generic files to ignore *~ diff --git a/CHANGELOG.md b/CHANGELOG.md index ecdaf16292..80747de10a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ The types of changes are: * Update `fideslang` to `1.1.0`, simplifying the default taxonomy and adding `tags` for resources [#865](https://github.com/ethyca/fides/pull/865) * Remove the `obscure` requirement from the `generate` endpoint [#819](https://github.com/ethyca/fides/pull/819) * Merge existing configurations with `fideslib` library [#913](https://github.com/ethyca/fides/pull/913) +* Moved frontend static files to `src/ui-build/static` [#934](https://github.com/ethyca/fides/pull/934) ### Developer Experience diff --git a/Dockerfile b/Dockerfile index 7284853177..31e798ac99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,7 +91,7 @@ ENV PYTHONUNBUFFERED=TRUE ENV RUNNING_IN_DOCKER=TRUE # Make a static files directory -RUN mkdir -p src/fidesctl/api/ctl/build/static +RUN mkdir -p src/ui-build/static/admin EXPOSE 8080 CMD ["fidesctl", "webserver"] @@ -116,4 +116,4 @@ RUN python setup.py sdist RUN pip install dist/fidesctl-*.tar.gz # Copy frontend build over -COPY --from=frontend /fides/clients/admin-ui/out/ /fides/src/fidesctl/api/ctl/build/static/ +COPY --from=frontend /fides/clients/admin-ui/out/ /fides/src/ui-build/static/admin/ diff --git a/clients/admin-ui/package.json b/clients/admin-ui/package.json index 1f425a4557..e5bddc2d1a 100644 --- a/clients/admin-ui/package.json +++ b/clients/admin-ui/package.json @@ -14,7 +14,7 @@ "analyze:server": "cross-env BUNDLE_ANALYZE=server next build", "analyze:browser": "cross-env BUNDLE_ANALYZE=browser next build", "export": "next build && next export", - "copy-export": "rsync -a --delete out/ ../../src/fidesctl/api/ctl/build/static/", + "copy-export": "rsync -a --delete out/ ../../src/ui-build/static/admin/", "prod-export": "npm run export && npm run copy-export", "cy:open": "cypress open", "cy:run": "cypress run", diff --git a/src/fidesctl/api/ctl/routes/util.py b/src/fidesctl/api/ctl/routes/util.py index 6cb3c9208a..021148b68d 100644 --- a/src/fidesctl/api/ctl/routes/util.py +++ b/src/fidesctl/api/ctl/routes/util.py @@ -7,7 +7,8 @@ from fidesctl.api.ctl.utils.api_router import APIRouter API_PREFIX = "/api/v1" -WEBAPP_DIRECTORY = Path("src/fidesctl/api/build/static") +FRONTEND_BUILD_DIRECTORY = Path("src/ui-build/static") +WEBAPP_DIRECTORY = FRONTEND_BUILD_DIRECTORY / "admin" WEBAPP_INDEX = WEBAPP_DIRECTORY / "index.html"