diff --git a/.github/workflows/frontend_pr_checks.yml b/.github/workflows/frontend_pr_checks.yml index 76f4c1cf3f..5e15009ff1 100644 --- a/.github/workflows/frontend_pr_checks.yml +++ b/.github/workflows/frontend_pr_checks.yml @@ -17,7 +17,7 @@ jobs: node-version: [16.x] defaults: run: - working-directory: clients/admin-ui + working-directory: clients/ctl/admin-ui steps: - name: Checkout uses: actions/checkout@v2 @@ -55,13 +55,13 @@ jobs: - name: Install dependencies run: | - cd clients/admin-ui + cd clients/ctl/admin-ui npm install - name: Cypress run uses: cypress-io/github-action@v4 with: - working-directory: clients/admin-ui + working-directory: clients/ctl/admin-ui install: false start: npm run cy:start wait-on: "http://localhost:3000" diff --git a/.github/workflows/publish_package.yaml b/.github/workflows/publish_package.yaml index 815283774c..ec0a261d9a 100644 --- a/.github/workflows/publish_package.yaml +++ b/.github/workflows/publish_package.yaml @@ -27,12 +27,12 @@ jobs: - name: Install node modules run: | - cd clients/admin-ui + cd clients/ctl/admin-ui npm install - name: Build and export frontend files run: | - cd clients/admin-ui + cd clients/ctl/admin-ui npm run prod-export - name: Install Twine and wheel diff --git a/CHANGELOG.md b/CHANGELOG.md index 644bd97dc6..619861e1cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The types of changes are: ### Changed * Upgraded base Docker version to Python 3.9 and updated all other references from 3.8 -> 3.9 [#974](https://github.com/ethyca/fides/pull/974) +* Moved the `admin-ui` code down one level into a `ctl` subdir [#970](https://github.com/ethyca/fides/pull/970) ## [1.8.1](https://github.com/ethyca/fides/compare/1.8.0...1.8.1) - 2022-08-08 diff --git a/Dockerfile b/Dockerfile index c0b64a0e9f..a0dedbe794 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,10 @@ RUN pip install -U pip #################### FROM node:16 as frontend -WORKDIR /fides/clients/admin-ui +WORKDIR /fides/clients/ctl/admin-ui # install node modules -COPY clients/admin-ui/ . +COPY clients/ctl/admin-ui/ . RUN npm install # Build the frontend static files @@ -112,7 +112,7 @@ RUN pip install --no-deps -e ".[all,mssql]" FROM builder as prod # Copy frontend build over in order to be available in wheel package -COPY --from=frontend /fides/clients/admin-ui/out/ /fides/src/fidesctl/ui-build/static/admin/ +COPY --from=frontend /fides/clients/ctl/admin-ui/out/ /fides/src/fidesctl/ui-build/static/admin/ # Install without a symlink RUN python setup.py bdist_wheel diff --git a/clients/admin-ui/.babelrc b/clients/ctl/admin-ui/.babelrc similarity index 100% rename from clients/admin-ui/.babelrc rename to clients/ctl/admin-ui/.babelrc diff --git a/clients/admin-ui/.env.development b/clients/ctl/admin-ui/.env.development similarity index 100% rename from clients/admin-ui/.env.development rename to clients/ctl/admin-ui/.env.development diff --git a/clients/admin-ui/.env.production b/clients/ctl/admin-ui/.env.production similarity index 100% rename from clients/admin-ui/.env.production rename to clients/ctl/admin-ui/.env.production diff --git a/clients/admin-ui/.eslintignore b/clients/ctl/admin-ui/.eslintignore similarity index 100% rename from clients/admin-ui/.eslintignore rename to clients/ctl/admin-ui/.eslintignore diff --git a/clients/admin-ui/.eslintrc.json b/clients/ctl/admin-ui/.eslintrc.json similarity index 100% rename from clients/admin-ui/.eslintrc.json rename to clients/ctl/admin-ui/.eslintrc.json diff --git a/clients/admin-ui/.gitignore b/clients/ctl/admin-ui/.gitignore similarity index 100% rename from clients/admin-ui/.gitignore rename to clients/ctl/admin-ui/.gitignore diff --git a/clients/admin-ui/.prettierrc.json b/clients/ctl/admin-ui/.prettierrc.json similarity index 100% rename from clients/admin-ui/.prettierrc.json rename to clients/ctl/admin-ui/.prettierrc.json diff --git a/clients/admin-ui/LICENSE b/clients/ctl/admin-ui/LICENSE similarity index 100% rename from clients/admin-ui/LICENSE rename to clients/ctl/admin-ui/LICENSE diff --git a/clients/admin-ui/README.md b/clients/ctl/admin-ui/README.md similarity index 100% rename from clients/admin-ui/README.md rename to clients/ctl/admin-ui/README.md diff --git a/clients/admin-ui/__tests__/checkbox-tree.test.tsx b/clients/ctl/admin-ui/__tests__/checkbox-tree.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/checkbox-tree.test.tsx rename to clients/ctl/admin-ui/__tests__/checkbox-tree.test.tsx diff --git a/clients/admin-ui/__tests__/features/dataset-helpers.test.tsx b/clients/ctl/admin-ui/__tests__/features/dataset-helpers.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/features/dataset-helpers.test.tsx rename to clients/ctl/admin-ui/__tests__/features/dataset-helpers.test.tsx diff --git a/clients/admin-ui/__tests__/features/system.slice.test.tsx b/clients/ctl/admin-ui/__tests__/features/system.slice.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/features/system.slice.test.tsx rename to clients/ctl/admin-ui/__tests__/features/system.slice.test.tsx diff --git a/clients/admin-ui/__tests__/features/system.test.tsx b/clients/ctl/admin-ui/__tests__/features/system.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/features/system.test.tsx rename to clients/ctl/admin-ui/__tests__/features/system.test.tsx diff --git a/clients/admin-ui/__tests__/features/taxonomy-transform.test.tsx b/clients/ctl/admin-ui/__tests__/features/taxonomy-transform.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/features/taxonomy-transform.test.tsx rename to clients/ctl/admin-ui/__tests__/features/taxonomy-transform.test.tsx diff --git a/clients/admin-ui/__tests__/index.test.tsx b/clients/ctl/admin-ui/__tests__/index.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/index.test.tsx rename to clients/ctl/admin-ui/__tests__/index.test.tsx diff --git a/clients/admin-ui/__tests__/jest.setup.ts b/clients/ctl/admin-ui/__tests__/jest.setup.ts similarity index 100% rename from clients/admin-ui/__tests__/jest.setup.ts rename to clients/ctl/admin-ui/__tests__/jest.setup.ts diff --git a/clients/admin-ui/__tests__/nav.test.tsx b/clients/ctl/admin-ui/__tests__/nav.test.tsx similarity index 100% rename from clients/admin-ui/__tests__/nav.test.tsx rename to clients/ctl/admin-ui/__tests__/nav.test.tsx diff --git a/clients/admin-ui/cypress.config.ts b/clients/ctl/admin-ui/cypress.config.ts similarity index 100% rename from clients/admin-ui/cypress.config.ts rename to clients/ctl/admin-ui/cypress.config.ts diff --git a/clients/admin-ui/cypress/.eslintrc.json b/clients/ctl/admin-ui/cypress/.eslintrc.json similarity index 100% rename from clients/admin-ui/cypress/.eslintrc.json rename to clients/ctl/admin-ui/cypress/.eslintrc.json diff --git a/clients/admin-ui/cypress/.gitignore b/clients/ctl/admin-ui/cypress/.gitignore similarity index 100% rename from clients/admin-ui/cypress/.gitignore rename to clients/ctl/admin-ui/cypress/.gitignore diff --git a/clients/admin-ui/cypress/e2e/config-wizard.cy.ts b/clients/ctl/admin-ui/cypress/e2e/config-wizard.cy.ts similarity index 100% rename from clients/admin-ui/cypress/e2e/config-wizard.cy.ts rename to clients/ctl/admin-ui/cypress/e2e/config-wizard.cy.ts diff --git a/clients/admin-ui/cypress/e2e/datasets.cy.ts b/clients/ctl/admin-ui/cypress/e2e/datasets.cy.ts similarity index 100% rename from clients/admin-ui/cypress/e2e/datasets.cy.ts rename to clients/ctl/admin-ui/cypress/e2e/datasets.cy.ts diff --git a/clients/admin-ui/cypress/e2e/taxonomy.cy.ts b/clients/ctl/admin-ui/cypress/e2e/taxonomy.cy.ts similarity index 100% rename from clients/admin-ui/cypress/e2e/taxonomy.cy.ts rename to clients/ctl/admin-ui/cypress/e2e/taxonomy.cy.ts diff --git a/clients/admin-ui/cypress/fixtures/data_categories.json b/clients/ctl/admin-ui/cypress/fixtures/data_categories.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/data_categories.json rename to clients/ctl/admin-ui/cypress/fixtures/data_categories.json diff --git a/clients/admin-ui/cypress/fixtures/data_qualifiers.json b/clients/ctl/admin-ui/cypress/fixtures/data_qualifiers.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/data_qualifiers.json rename to clients/ctl/admin-ui/cypress/fixtures/data_qualifiers.json diff --git a/clients/admin-ui/cypress/fixtures/data_subjects.json b/clients/ctl/admin-ui/cypress/fixtures/data_subjects.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/data_subjects.json rename to clients/ctl/admin-ui/cypress/fixtures/data_subjects.json diff --git a/clients/admin-ui/cypress/fixtures/data_uses.json b/clients/ctl/admin-ui/cypress/fixtures/data_uses.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/data_uses.json rename to clients/ctl/admin-ui/cypress/fixtures/data_uses.json diff --git a/clients/admin-ui/cypress/fixtures/dataset.json b/clients/ctl/admin-ui/cypress/fixtures/dataset.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/dataset.json rename to clients/ctl/admin-ui/cypress/fixtures/dataset.json diff --git a/clients/admin-ui/cypress/fixtures/datasets.json b/clients/ctl/admin-ui/cypress/fixtures/datasets.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/datasets.json rename to clients/ctl/admin-ui/cypress/fixtures/datasets.json diff --git a/clients/admin-ui/cypress/fixtures/generate/dataset.json b/clients/ctl/admin-ui/cypress/fixtures/generate/dataset.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/generate/dataset.json rename to clients/ctl/admin-ui/cypress/fixtures/generate/dataset.json diff --git a/clients/admin-ui/cypress/fixtures/generate/system.json b/clients/ctl/admin-ui/cypress/fixtures/generate/system.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/generate/system.json rename to clients/ctl/admin-ui/cypress/fixtures/generate/system.json diff --git a/clients/admin-ui/cypress/fixtures/organization.json b/clients/ctl/admin-ui/cypress/fixtures/organization.json similarity index 100% rename from clients/admin-ui/cypress/fixtures/organization.json rename to clients/ctl/admin-ui/cypress/fixtures/organization.json diff --git a/clients/admin-ui/cypress/support/commands.ts b/clients/ctl/admin-ui/cypress/support/commands.ts similarity index 100% rename from clients/admin-ui/cypress/support/commands.ts rename to clients/ctl/admin-ui/cypress/support/commands.ts diff --git a/clients/admin-ui/cypress/support/e2e.ts b/clients/ctl/admin-ui/cypress/support/e2e.ts similarity index 100% rename from clients/admin-ui/cypress/support/e2e.ts rename to clients/ctl/admin-ui/cypress/support/e2e.ts diff --git a/clients/admin-ui/cypress/tsconfig.json b/clients/ctl/admin-ui/cypress/tsconfig.json similarity index 100% rename from clients/admin-ui/cypress/tsconfig.json rename to clients/ctl/admin-ui/cypress/tsconfig.json diff --git a/clients/admin-ui/jest.config.js b/clients/ctl/admin-ui/jest.config.js similarity index 100% rename from clients/admin-ui/jest.config.js rename to clients/ctl/admin-ui/jest.config.js diff --git a/clients/admin-ui/next-env.d.ts b/clients/ctl/admin-ui/next-env.d.ts similarity index 100% rename from clients/admin-ui/next-env.d.ts rename to clients/ctl/admin-ui/next-env.d.ts diff --git a/clients/admin-ui/next.config.js b/clients/ctl/admin-ui/next.config.js similarity index 100% rename from clients/admin-ui/next.config.js rename to clients/ctl/admin-ui/next.config.js diff --git a/clients/admin-ui/package-lock.json b/clients/ctl/admin-ui/package-lock.json similarity index 100% rename from clients/admin-ui/package-lock.json rename to clients/ctl/admin-ui/package-lock.json diff --git a/clients/admin-ui/package.json b/clients/ctl/admin-ui/package.json similarity index 95% rename from clients/admin-ui/package.json rename to clients/ctl/admin-ui/package.json index 5d950df08a..937f17ba12 100644 --- a/clients/admin-ui/package.json +++ b/clients/ctl/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": "mkdir -p ../../src/fidesctl/ui-build/static/admin/ && rsync -a --delete out/ ../../src/fidesctl/ui-build/static/admin/", + "copy-export": "mkdir -p ../../../src/fidesctl/ui-build/static/admin/ && rsync -a --delete out/ ../../../src/fidesctl/ui-build/static/admin/", "prod-export": "npm run export && npm run copy-export", "cy:open": "cypress open", "cy:run": "cypress run", diff --git a/clients/admin-ui/public/favicon.ico b/clients/ctl/admin-ui/public/favicon.ico similarity index 100% rename from clients/admin-ui/public/favicon.ico rename to clients/ctl/admin-ui/public/favicon.ico diff --git a/clients/admin-ui/public/logo-icon.svg b/clients/ctl/admin-ui/public/logo-icon.svg similarity index 100% rename from clients/admin-ui/public/logo-icon.svg rename to clients/ctl/admin-ui/public/logo-icon.svg diff --git a/clients/admin-ui/public/logo.svg b/clients/ctl/admin-ui/public/logo.svg similarity index 100% rename from clients/admin-ui/public/logo.svg rename to clients/ctl/admin-ui/public/logo.svg diff --git a/clients/admin-ui/src/app/hooks.ts b/clients/ctl/admin-ui/src/app/hooks.ts similarity index 100% rename from clients/admin-ui/src/app/hooks.ts rename to clients/ctl/admin-ui/src/app/hooks.ts diff --git a/clients/admin-ui/src/app/store.ts b/clients/ctl/admin-ui/src/app/store.ts similarity index 100% rename from clients/admin-ui/src/app/store.ts rename to clients/ctl/admin-ui/src/app/store.ts diff --git a/clients/admin-ui/src/features/common/AccordionTree.tsx b/clients/ctl/admin-ui/src/features/common/AccordionTree.tsx similarity index 100% rename from clients/admin-ui/src/features/common/AccordionTree.tsx rename to clients/ctl/admin-ui/src/features/common/AccordionTree.tsx diff --git a/clients/admin-ui/src/features/common/CheckboxTree.tsx b/clients/ctl/admin-ui/src/features/common/CheckboxTree.tsx similarity index 100% rename from clients/admin-ui/src/features/common/CheckboxTree.tsx rename to clients/ctl/admin-ui/src/features/common/CheckboxTree.tsx diff --git a/clients/admin-ui/src/features/common/ConfirmationModal.tsx b/clients/ctl/admin-ui/src/features/common/ConfirmationModal.tsx similarity index 100% rename from clients/admin-ui/src/features/common/ConfirmationModal.tsx rename to clients/ctl/admin-ui/src/features/common/ConfirmationModal.tsx diff --git a/clients/admin-ui/src/features/common/DataTabs.tsx b/clients/ctl/admin-ui/src/features/common/DataTabs.tsx similarity index 100% rename from clients/admin-ui/src/features/common/DataTabs.tsx rename to clients/ctl/admin-ui/src/features/common/DataTabs.tsx diff --git a/clients/admin-ui/src/features/common/DocsLink.tsx b/clients/ctl/admin-ui/src/features/common/DocsLink.tsx similarity index 100% rename from clients/admin-ui/src/features/common/DocsLink.tsx rename to clients/ctl/admin-ui/src/features/common/DocsLink.tsx diff --git a/clients/admin-ui/src/features/common/Header.tsx b/clients/ctl/admin-ui/src/features/common/Header.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Header.tsx rename to clients/ctl/admin-ui/src/features/common/Header.tsx diff --git a/clients/admin-ui/src/features/common/HorizontalStepper.tsx b/clients/ctl/admin-ui/src/features/common/HorizontalStepper.tsx similarity index 100% rename from clients/admin-ui/src/features/common/HorizontalStepper.tsx rename to clients/ctl/admin-ui/src/features/common/HorizontalStepper.tsx diff --git a/clients/admin-ui/src/features/common/Icon/AWSLogo.tsx b/clients/ctl/admin-ui/src/features/common/Icon/AWSLogo.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/AWSLogo.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/AWSLogo.tsx diff --git a/clients/admin-ui/src/features/common/Icon/Add.tsx b/clients/ctl/admin-ui/src/features/common/Icon/Add.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/Add.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/Add.tsx diff --git a/clients/admin-ui/src/features/common/Icon/ArrowDownLine.tsx b/clients/ctl/admin-ui/src/features/common/Icon/ArrowDownLine.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/ArrowDownLine.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/ArrowDownLine.tsx diff --git a/clients/admin-ui/src/features/common/Icon/ArrowUpLine.tsx b/clients/ctl/admin-ui/src/features/common/Icon/ArrowUpLine.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/ArrowUpLine.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/ArrowUpLine.tsx diff --git a/clients/admin-ui/src/features/common/Icon/CloseSolid.tsx b/clients/ctl/admin-ui/src/features/common/Icon/CloseSolid.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/CloseSolid.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/CloseSolid.tsx diff --git a/clients/admin-ui/src/features/common/Icon/DownloadSolid.tsx b/clients/ctl/admin-ui/src/features/common/Icon/DownloadSolid.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/DownloadSolid.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/DownloadSolid.tsx diff --git a/clients/admin-ui/src/features/common/Icon/Eye.tsx b/clients/ctl/admin-ui/src/features/common/Icon/Eye.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/Eye.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/Eye.tsx diff --git a/clients/admin-ui/src/features/common/Icon/Gear.tsx b/clients/ctl/admin-ui/src/features/common/Icon/Gear.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/Gear.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/Gear.tsx diff --git a/clients/admin-ui/src/features/common/Icon/HorizontalLine.tsx b/clients/ctl/admin-ui/src/features/common/Icon/HorizontalLine.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/HorizontalLine.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/HorizontalLine.tsx diff --git a/clients/admin-ui/src/features/common/Icon/ManualSetup.tsx b/clients/ctl/admin-ui/src/features/common/Icon/ManualSetup.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/ManualSetup.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/ManualSetup.tsx diff --git a/clients/admin-ui/src/features/common/Icon/More.tsx b/clients/ctl/admin-ui/src/features/common/Icon/More.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/More.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/More.tsx diff --git a/clients/admin-ui/src/features/common/Icon/OktaLogo.tsx b/clients/ctl/admin-ui/src/features/common/Icon/OktaLogo.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/OktaLogo.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/OktaLogo.tsx diff --git a/clients/admin-ui/src/features/common/Icon/Question.tsx b/clients/ctl/admin-ui/src/features/common/Icon/Question.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/Question.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/Question.tsx diff --git a/clients/admin-ui/src/features/common/Icon/SearchLine.tsx b/clients/ctl/admin-ui/src/features/common/Icon/SearchLine.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/SearchLine.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/SearchLine.tsx diff --git a/clients/admin-ui/src/features/common/Icon/StepperCircle.tsx b/clients/ctl/admin-ui/src/features/common/Icon/StepperCircle.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/StepperCircle.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/StepperCircle.tsx diff --git a/clients/admin-ui/src/features/common/Icon/StepperCircleCheckmark.tsx b/clients/ctl/admin-ui/src/features/common/Icon/StepperCircleCheckmark.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/StepperCircleCheckmark.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/StepperCircleCheckmark.tsx diff --git a/clients/admin-ui/src/features/common/Icon/TrashCanSolid.tsx b/clients/ctl/admin-ui/src/features/common/Icon/TrashCanSolid.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/TrashCanSolid.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/TrashCanSolid.tsx diff --git a/clients/admin-ui/src/features/common/Icon/User.tsx b/clients/ctl/admin-ui/src/features/common/Icon/User.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/User.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/User.tsx diff --git a/clients/admin-ui/src/features/common/Icon/VerticalLine.tsx b/clients/ctl/admin-ui/src/features/common/Icon/VerticalLine.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/VerticalLine.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/VerticalLine.tsx diff --git a/clients/admin-ui/src/features/common/Icon/index.tsx b/clients/ctl/admin-ui/src/features/common/Icon/index.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Icon/index.tsx rename to clients/ctl/admin-ui/src/features/common/Icon/index.tsx diff --git a/clients/admin-ui/src/features/common/Layout.tsx b/clients/ctl/admin-ui/src/features/common/Layout.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Layout.tsx rename to clients/ctl/admin-ui/src/features/common/Layout.tsx diff --git a/clients/admin-ui/src/features/common/NavBar.tsx b/clients/ctl/admin-ui/src/features/common/NavBar.tsx similarity index 100% rename from clients/admin-ui/src/features/common/NavBar.tsx rename to clients/ctl/admin-ui/src/features/common/NavBar.tsx diff --git a/clients/admin-ui/src/features/common/QuestionTooltip.tsx b/clients/ctl/admin-ui/src/features/common/QuestionTooltip.tsx similarity index 100% rename from clients/admin-ui/src/features/common/QuestionTooltip.tsx rename to clients/ctl/admin-ui/src/features/common/QuestionTooltip.tsx diff --git a/clients/admin-ui/src/features/common/Stepper.tsx b/clients/ctl/admin-ui/src/features/common/Stepper.tsx similarity index 100% rename from clients/admin-ui/src/features/common/Stepper.tsx rename to clients/ctl/admin-ui/src/features/common/Stepper.tsx diff --git a/clients/admin-ui/src/features/common/countries.ts b/clients/ctl/admin-ui/src/features/common/countries.ts similarity index 100% rename from clients/admin-ui/src/features/common/countries.ts rename to clients/ctl/admin-ui/src/features/common/countries.ts diff --git a/clients/admin-ui/src/features/common/form/inputs.tsx b/clients/ctl/admin-ui/src/features/common/form/inputs.tsx similarity index 100% rename from clients/admin-ui/src/features/common/form/inputs.tsx rename to clients/ctl/admin-ui/src/features/common/form/inputs.tsx diff --git a/clients/admin-ui/src/features/common/helpers.ts b/clients/ctl/admin-ui/src/features/common/helpers.ts similarity index 100% rename from clients/admin-ui/src/features/common/helpers.ts rename to clients/ctl/admin-ui/src/features/common/helpers.ts diff --git a/clients/admin-ui/src/features/common/toast.tsx b/clients/ctl/admin-ui/src/features/common/toast.tsx similarity index 100% rename from clients/admin-ui/src/features/common/toast.tsx rename to clients/ctl/admin-ui/src/features/common/toast.tsx diff --git a/clients/admin-ui/src/features/common/types.tsx b/clients/ctl/admin-ui/src/features/common/types.tsx similarity index 100% rename from clients/admin-ui/src/features/common/types.tsx rename to clients/ctl/admin-ui/src/features/common/types.tsx diff --git a/clients/admin-ui/src/features/config-wizard/AddSystemForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/AddSystemForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/AddSystemForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/AddSystemForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/AuthenticateAwsForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/AuthenticateAwsForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/AuthenticateAwsForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/AuthenticateAwsForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/AuthenticateScanner.tsx b/clients/ctl/admin-ui/src/features/config-wizard/AuthenticateScanner.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/AuthenticateScanner.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/AuthenticateScanner.tsx diff --git a/clients/admin-ui/src/features/config-wizard/ConfigWizardWalkthrough.tsx b/clients/ctl/admin-ui/src/features/config-wizard/ConfigWizardWalkthrough.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/ConfigWizardWalkthrough.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/ConfigWizardWalkthrough.tsx diff --git a/clients/admin-ui/src/features/config-wizard/DescribeSystemsForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/DescribeSystemsForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/DescribeSystemsForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/DescribeSystemsForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/OrganizationInfoForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/OrganizationInfoForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/OrganizationInfoForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/OrganizationInfoForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/PrivacyDeclarationForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/PrivacyDeclarationForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/PrivacyDeclarationForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/PrivacyDeclarationForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/ReviewSystemForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/ReviewSystemForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/ReviewSystemForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/ReviewSystemForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/ScanResultsForm.tsx b/clients/ctl/admin-ui/src/features/config-wizard/ScanResultsForm.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/ScanResultsForm.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/ScanResultsForm.tsx diff --git a/clients/admin-ui/src/features/config-wizard/ScannerError.tsx b/clients/ctl/admin-ui/src/features/config-wizard/ScannerError.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/ScannerError.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/ScannerError.tsx diff --git a/clients/admin-ui/src/features/config-wizard/SuccessPage.tsx b/clients/ctl/admin-ui/src/features/config-wizard/SuccessPage.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/SuccessPage.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/SuccessPage.tsx diff --git a/clients/admin-ui/src/features/config-wizard/ViewYourDataMapPage.tsx b/clients/ctl/admin-ui/src/features/config-wizard/ViewYourDataMapPage.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/ViewYourDataMapPage.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/ViewYourDataMapPage.tsx diff --git a/clients/admin-ui/src/features/config-wizard/config-wizard.slice.ts b/clients/ctl/admin-ui/src/features/config-wizard/config-wizard.slice.ts similarity index 100% rename from clients/admin-ui/src/features/config-wizard/config-wizard.slice.ts rename to clients/ctl/admin-ui/src/features/config-wizard/config-wizard.slice.ts diff --git a/clients/admin-ui/src/features/config-wizard/constants.tsx b/clients/ctl/admin-ui/src/features/config-wizard/constants.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/constants.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/constants.tsx diff --git a/clients/admin-ui/src/features/config-wizard/scanner.slice.ts b/clients/ctl/admin-ui/src/features/config-wizard/scanner.slice.ts similarity index 100% rename from clients/admin-ui/src/features/config-wizard/scanner.slice.ts rename to clients/ctl/admin-ui/src/features/config-wizard/scanner.slice.ts diff --git a/clients/admin-ui/src/features/config-wizard/setup.tsx b/clients/ctl/admin-ui/src/features/config-wizard/setup.tsx similarity index 100% rename from clients/admin-ui/src/features/config-wizard/setup.tsx rename to clients/ctl/admin-ui/src/features/config-wizard/setup.tsx diff --git a/clients/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts b/clients/ctl/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts similarity index 100% rename from clients/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts rename to clients/ctl/admin-ui/src/features/data-qualifier/data-qualifier.slice.ts diff --git a/clients/admin-ui/src/features/data-subjects/data-subject.slice.ts b/clients/ctl/admin-ui/src/features/data-subjects/data-subject.slice.ts similarity index 100% rename from clients/admin-ui/src/features/data-subjects/data-subject.slice.ts rename to clients/ctl/admin-ui/src/features/data-subjects/data-subject.slice.ts diff --git a/clients/admin-ui/src/features/data-use/data-use.slice.ts b/clients/ctl/admin-ui/src/features/data-use/data-use.slice.ts similarity index 100% rename from clients/admin-ui/src/features/data-use/data-use.slice.ts rename to clients/ctl/admin-ui/src/features/data-use/data-use.slice.ts diff --git a/clients/admin-ui/src/features/dataset/ColumnDropdown.tsx b/clients/ctl/admin-ui/src/features/dataset/ColumnDropdown.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/ColumnDropdown.tsx rename to clients/ctl/admin-ui/src/features/dataset/ColumnDropdown.tsx diff --git a/clients/admin-ui/src/features/dataset/DataCategoryInput.tsx b/clients/ctl/admin-ui/src/features/dataset/DataCategoryInput.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DataCategoryInput.tsx rename to clients/ctl/admin-ui/src/features/dataset/DataCategoryInput.tsx diff --git a/clients/admin-ui/src/features/dataset/DatabaseConnectForm.tsx b/clients/ctl/admin-ui/src/features/dataset/DatabaseConnectForm.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DatabaseConnectForm.tsx rename to clients/ctl/admin-ui/src/features/dataset/DatabaseConnectForm.tsx diff --git a/clients/admin-ui/src/features/dataset/DatasetCollectionView.tsx b/clients/ctl/admin-ui/src/features/dataset/DatasetCollectionView.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DatasetCollectionView.tsx rename to clients/ctl/admin-ui/src/features/dataset/DatasetCollectionView.tsx diff --git a/clients/admin-ui/src/features/dataset/DatasetFieldsTable.tsx b/clients/ctl/admin-ui/src/features/dataset/DatasetFieldsTable.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DatasetFieldsTable.tsx rename to clients/ctl/admin-ui/src/features/dataset/DatasetFieldsTable.tsx diff --git a/clients/admin-ui/src/features/dataset/DatasetTable.tsx b/clients/ctl/admin-ui/src/features/dataset/DatasetTable.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DatasetTable.tsx rename to clients/ctl/admin-ui/src/features/dataset/DatasetTable.tsx diff --git a/clients/admin-ui/src/features/dataset/DatasetYamlForm.tsx b/clients/ctl/admin-ui/src/features/dataset/DatasetYamlForm.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/DatasetYamlForm.tsx rename to clients/ctl/admin-ui/src/features/dataset/DatasetYamlForm.tsx diff --git a/clients/admin-ui/src/features/dataset/EditCollectionDrawer.tsx b/clients/ctl/admin-ui/src/features/dataset/EditCollectionDrawer.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditCollectionDrawer.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditCollectionDrawer.tsx diff --git a/clients/admin-ui/src/features/dataset/EditCollectionOrFieldForm.tsx b/clients/ctl/admin-ui/src/features/dataset/EditCollectionOrFieldForm.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditCollectionOrFieldForm.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditCollectionOrFieldForm.tsx diff --git a/clients/admin-ui/src/features/dataset/EditDatasetDrawer.tsx b/clients/ctl/admin-ui/src/features/dataset/EditDatasetDrawer.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditDatasetDrawer.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditDatasetDrawer.tsx diff --git a/clients/admin-ui/src/features/dataset/EditDatasetForm.tsx b/clients/ctl/admin-ui/src/features/dataset/EditDatasetForm.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditDatasetForm.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditDatasetForm.tsx diff --git a/clients/admin-ui/src/features/dataset/EditDrawer.tsx b/clients/ctl/admin-ui/src/features/dataset/EditDrawer.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditDrawer.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditDrawer.tsx diff --git a/clients/admin-ui/src/features/dataset/EditFieldDrawer.tsx b/clients/ctl/admin-ui/src/features/dataset/EditFieldDrawer.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/EditFieldDrawer.tsx rename to clients/ctl/admin-ui/src/features/dataset/EditFieldDrawer.tsx diff --git a/clients/admin-ui/src/features/dataset/MoreActionsMenu.tsx b/clients/ctl/admin-ui/src/features/dataset/MoreActionsMenu.tsx similarity index 100% rename from clients/admin-ui/src/features/dataset/MoreActionsMenu.tsx rename to clients/ctl/admin-ui/src/features/dataset/MoreActionsMenu.tsx diff --git a/clients/admin-ui/src/features/dataset/constants.ts b/clients/ctl/admin-ui/src/features/dataset/constants.ts similarity index 100% rename from clients/admin-ui/src/features/dataset/constants.ts rename to clients/ctl/admin-ui/src/features/dataset/constants.ts diff --git a/clients/admin-ui/src/features/dataset/dataset.slice.ts b/clients/ctl/admin-ui/src/features/dataset/dataset.slice.ts similarity index 100% rename from clients/admin-ui/src/features/dataset/dataset.slice.ts rename to clients/ctl/admin-ui/src/features/dataset/dataset.slice.ts diff --git a/clients/admin-ui/src/features/dataset/helpers.ts b/clients/ctl/admin-ui/src/features/dataset/helpers.ts similarity index 100% rename from clients/admin-ui/src/features/dataset/helpers.ts rename to clients/ctl/admin-ui/src/features/dataset/helpers.ts diff --git a/clients/admin-ui/src/features/dataset/index.ts b/clients/ctl/admin-ui/src/features/dataset/index.ts similarity index 100% rename from clients/admin-ui/src/features/dataset/index.ts rename to clients/ctl/admin-ui/src/features/dataset/index.ts diff --git a/clients/admin-ui/src/features/dataset/types.ts b/clients/ctl/admin-ui/src/features/dataset/types.ts similarity index 100% rename from clients/admin-ui/src/features/dataset/types.ts rename to clients/ctl/admin-ui/src/features/dataset/types.ts diff --git a/clients/admin-ui/src/features/organization/constants.ts b/clients/ctl/admin-ui/src/features/organization/constants.ts similarity index 100% rename from clients/admin-ui/src/features/organization/constants.ts rename to clients/ctl/admin-ui/src/features/organization/constants.ts diff --git a/clients/admin-ui/src/features/organization/index.ts b/clients/ctl/admin-ui/src/features/organization/index.ts similarity index 100% rename from clients/admin-ui/src/features/organization/index.ts rename to clients/ctl/admin-ui/src/features/organization/index.ts diff --git a/clients/admin-ui/src/features/organization/organization.slice.ts b/clients/ctl/admin-ui/src/features/organization/organization.slice.ts similarity index 100% rename from clients/admin-ui/src/features/organization/organization.slice.ts rename to clients/ctl/admin-ui/src/features/organization/organization.slice.ts diff --git a/clients/admin-ui/src/features/system/SystemTable.tsx b/clients/ctl/admin-ui/src/features/system/SystemTable.tsx similarity index 100% rename from clients/admin-ui/src/features/system/SystemTable.tsx rename to clients/ctl/admin-ui/src/features/system/SystemTable.tsx diff --git a/clients/admin-ui/src/features/system/index.ts b/clients/ctl/admin-ui/src/features/system/index.ts similarity index 100% rename from clients/admin-ui/src/features/system/index.ts rename to clients/ctl/admin-ui/src/features/system/index.ts diff --git a/clients/admin-ui/src/features/system/system.slice.ts b/clients/ctl/admin-ui/src/features/system/system.slice.ts similarity index 100% rename from clients/admin-ui/src/features/system/system.slice.ts rename to clients/ctl/admin-ui/src/features/system/system.slice.ts diff --git a/clients/admin-ui/src/features/taxonomy/DataCategoriesTab.tsx b/clients/ctl/admin-ui/src/features/taxonomy/DataCategoriesTab.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/DataCategoriesTab.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/DataCategoriesTab.tsx diff --git a/clients/admin-ui/src/features/taxonomy/DataCategoryChecklist.tsx b/clients/ctl/admin-ui/src/features/taxonomy/DataCategoryChecklist.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/DataCategoryChecklist.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/DataCategoryChecklist.tsx diff --git a/clients/admin-ui/src/features/taxonomy/DataCategoryTag.tsx b/clients/ctl/admin-ui/src/features/taxonomy/DataCategoryTag.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/DataCategoryTag.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/DataCategoryTag.tsx diff --git a/clients/admin-ui/src/features/taxonomy/DataSubjectsTab.tsx b/clients/ctl/admin-ui/src/features/taxonomy/DataSubjectsTab.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/DataSubjectsTab.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/DataSubjectsTab.tsx diff --git a/clients/admin-ui/src/features/taxonomy/DataUsesTab.tsx b/clients/ctl/admin-ui/src/features/taxonomy/DataUsesTab.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/DataUsesTab.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/DataUsesTab.tsx diff --git a/clients/admin-ui/src/features/taxonomy/IdentifiabilityTab.tsx b/clients/ctl/admin-ui/src/features/taxonomy/IdentifiabilityTab.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/IdentifiabilityTab.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/IdentifiabilityTab.tsx diff --git a/clients/admin-ui/src/features/taxonomy/IdentifiabilityTag.tsx b/clients/ctl/admin-ui/src/features/taxonomy/IdentifiabilityTag.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/IdentifiabilityTag.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/IdentifiabilityTag.tsx diff --git a/clients/admin-ui/src/features/taxonomy/TaxonomyTabContent.tsx b/clients/ctl/admin-ui/src/features/taxonomy/TaxonomyTabContent.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/TaxonomyTabContent.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/TaxonomyTabContent.tsx diff --git a/clients/admin-ui/src/features/taxonomy/TaxonomyTabs.tsx b/clients/ctl/admin-ui/src/features/taxonomy/TaxonomyTabs.tsx similarity index 100% rename from clients/admin-ui/src/features/taxonomy/TaxonomyTabs.tsx rename to clients/ctl/admin-ui/src/features/taxonomy/TaxonomyTabs.tsx diff --git a/clients/admin-ui/src/features/taxonomy/data-categories.slice.ts b/clients/ctl/admin-ui/src/features/taxonomy/data-categories.slice.ts similarity index 100% rename from clients/admin-ui/src/features/taxonomy/data-categories.slice.ts rename to clients/ctl/admin-ui/src/features/taxonomy/data-categories.slice.ts diff --git a/clients/admin-ui/src/features/taxonomy/helpers.ts b/clients/ctl/admin-ui/src/features/taxonomy/helpers.ts similarity index 100% rename from clients/admin-ui/src/features/taxonomy/helpers.ts rename to clients/ctl/admin-ui/src/features/taxonomy/helpers.ts diff --git a/clients/admin-ui/src/features/taxonomy/index.ts b/clients/ctl/admin-ui/src/features/taxonomy/index.ts similarity index 100% rename from clients/admin-ui/src/features/taxonomy/index.ts rename to clients/ctl/admin-ui/src/features/taxonomy/index.ts diff --git a/clients/admin-ui/src/features/taxonomy/types.ts b/clients/ctl/admin-ui/src/features/taxonomy/types.ts similarity index 100% rename from clients/admin-ui/src/features/taxonomy/types.ts rename to clients/ctl/admin-ui/src/features/taxonomy/types.ts diff --git a/clients/admin-ui/src/features/user/index.ts b/clients/ctl/admin-ui/src/features/user/index.ts similarity index 100% rename from clients/admin-ui/src/features/user/index.ts rename to clients/ctl/admin-ui/src/features/user/index.ts diff --git a/clients/admin-ui/src/features/user/user.slice.ts b/clients/ctl/admin-ui/src/features/user/user.slice.ts similarity index 100% rename from clients/admin-ui/src/features/user/user.slice.ts rename to clients/ctl/admin-ui/src/features/user/user.slice.ts diff --git a/clients/admin-ui/src/mocks/browser.ts b/clients/ctl/admin-ui/src/mocks/browser.ts similarity index 100% rename from clients/admin-ui/src/mocks/browser.ts rename to clients/ctl/admin-ui/src/mocks/browser.ts diff --git a/clients/admin-ui/src/mocks/data.ts b/clients/ctl/admin-ui/src/mocks/data.ts similarity index 100% rename from clients/admin-ui/src/mocks/data.ts rename to clients/ctl/admin-ui/src/mocks/data.ts diff --git a/clients/admin-ui/src/mocks/handlers.ts b/clients/ctl/admin-ui/src/mocks/handlers.ts similarity index 100% rename from clients/admin-ui/src/mocks/handlers.ts rename to clients/ctl/admin-ui/src/mocks/handlers.ts diff --git a/clients/admin-ui/src/mocks/index.ts b/clients/ctl/admin-ui/src/mocks/index.ts similarity index 100% rename from clients/admin-ui/src/mocks/index.ts rename to clients/ctl/admin-ui/src/mocks/index.ts diff --git a/clients/admin-ui/src/mocks/server.ts b/clients/ctl/admin-ui/src/mocks/server.ts similarity index 100% rename from clients/admin-ui/src/mocks/server.ts rename to clients/ctl/admin-ui/src/mocks/server.ts diff --git a/clients/admin-ui/src/pages/404.tsx b/clients/ctl/admin-ui/src/pages/404.tsx similarity index 100% rename from clients/admin-ui/src/pages/404.tsx rename to clients/ctl/admin-ui/src/pages/404.tsx diff --git a/clients/admin-ui/src/pages/_app.tsx b/clients/ctl/admin-ui/src/pages/_app.tsx similarity index 100% rename from clients/admin-ui/src/pages/_app.tsx rename to clients/ctl/admin-ui/src/pages/_app.tsx diff --git a/clients/admin-ui/src/pages/api/auth/[...nextauth].ts b/clients/ctl/admin-ui/src/pages/api/auth/[...nextauth].ts similarity index 100% rename from clients/admin-ui/src/pages/api/auth/[...nextauth].ts rename to clients/ctl/admin-ui/src/pages/api/auth/[...nextauth].ts diff --git a/clients/admin-ui/src/pages/config-wizard/index.tsx b/clients/ctl/admin-ui/src/pages/config-wizard/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/config-wizard/index.tsx rename to clients/ctl/admin-ui/src/pages/config-wizard/index.tsx diff --git a/clients/admin-ui/src/pages/dataset/[id].tsx b/clients/ctl/admin-ui/src/pages/dataset/[id].tsx similarity index 100% rename from clients/admin-ui/src/pages/dataset/[id].tsx rename to clients/ctl/admin-ui/src/pages/dataset/[id].tsx diff --git a/clients/admin-ui/src/pages/dataset/index.tsx b/clients/ctl/admin-ui/src/pages/dataset/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/dataset/index.tsx rename to clients/ctl/admin-ui/src/pages/dataset/index.tsx diff --git a/clients/admin-ui/src/pages/dataset/new/index.tsx b/clients/ctl/admin-ui/src/pages/dataset/new/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/dataset/new/index.tsx rename to clients/ctl/admin-ui/src/pages/dataset/new/index.tsx diff --git a/clients/admin-ui/src/pages/index.tsx b/clients/ctl/admin-ui/src/pages/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/index.tsx rename to clients/ctl/admin-ui/src/pages/index.tsx diff --git a/clients/admin-ui/src/pages/login.tsx b/clients/ctl/admin-ui/src/pages/login.tsx similarity index 100% rename from clients/admin-ui/src/pages/login.tsx rename to clients/ctl/admin-ui/src/pages/login.tsx diff --git a/clients/admin-ui/src/pages/system/index.tsx b/clients/ctl/admin-ui/src/pages/system/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/system/index.tsx rename to clients/ctl/admin-ui/src/pages/system/index.tsx diff --git a/clients/admin-ui/src/pages/taxonomy/index.tsx b/clients/ctl/admin-ui/src/pages/taxonomy/index.tsx similarity index 100% rename from clients/admin-ui/src/pages/taxonomy/index.tsx rename to clients/ctl/admin-ui/src/pages/taxonomy/index.tsx diff --git a/clients/admin-ui/src/test-utils.tsx b/clients/ctl/admin-ui/src/test-utils.tsx similarity index 100% rename from clients/admin-ui/src/test-utils.tsx rename to clients/ctl/admin-ui/src/test-utils.tsx diff --git a/clients/admin-ui/src/theme/components/button.ts b/clients/ctl/admin-ui/src/theme/components/button.ts similarity index 100% rename from clients/admin-ui/src/theme/components/button.ts rename to clients/ctl/admin-ui/src/theme/components/button.ts diff --git a/clients/admin-ui/src/theme/index.ts b/clients/ctl/admin-ui/src/theme/index.ts similarity index 100% rename from clients/admin-ui/src/theme/index.ts rename to clients/ctl/admin-ui/src/theme/index.ts diff --git a/clients/admin-ui/src/types/api/README.md b/clients/ctl/admin-ui/src/types/api/README.md similarity index 90% rename from clients/admin-ui/src/types/api/README.md rename to clients/ctl/admin-ui/src/types/api/README.md index 263f06a1b9..a1d4b9f11f 100644 --- a/clients/admin-ui/src/types/api/README.md +++ b/clients/ctl/admin-ui/src/types/api/README.md @@ -18,10 +18,10 @@ These files can by regenerated by running: npm run openapi:generate ``` -**The fidesctl server must be running on `localhost:8080`**. This will read the schema hosted at http://localhost:8080/docs and generate all TS files under `clients/admin-ui/src/types/api/`. +**The fidesctl server must be running on `localhost:8080`**. This will read the schema hosted at http://localhost:8080/docs and generate all TS files under `clients/ctl/admin-ui/src/types/api/`. ## Resources - [FastAPI Client Generation](https://fastapi.tiangolo.com/advanced/generate-clients/?h=typescript#install-openapi-typescript-codegen) -- [OpenAPI Typescript Codegen](https://github.com/ferdikoomen/openapi-typescript-codegen) \ No newline at end of file +- [OpenAPI Typescript Codegen](https://github.com/ferdikoomen/openapi-typescript-codegen) diff --git a/clients/admin-ui/src/types/api/index.ts b/clients/ctl/admin-ui/src/types/api/index.ts similarity index 100% rename from clients/admin-ui/src/types/api/index.ts rename to clients/ctl/admin-ui/src/types/api/index.ts diff --git a/clients/admin-ui/src/types/api/models/AWSConfig.ts b/clients/ctl/admin-ui/src/types/api/models/AWSConfig.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/AWSConfig.ts rename to clients/ctl/admin-ui/src/types/api/models/AWSConfig.ts diff --git a/clients/admin-ui/src/types/api/models/ContactDetails.ts b/clients/ctl/admin-ui/src/types/api/models/ContactDetails.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ContactDetails.ts rename to clients/ctl/admin-ui/src/types/api/models/ContactDetails.ts diff --git a/clients/admin-ui/src/types/api/models/DBActions.ts b/clients/ctl/admin-ui/src/types/api/models/DBActions.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DBActions.ts rename to clients/ctl/admin-ui/src/types/api/models/DBActions.ts diff --git a/clients/admin-ui/src/types/api/models/DataCategory.ts b/clients/ctl/admin-ui/src/types/api/models/DataCategory.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataCategory.ts rename to clients/ctl/admin-ui/src/types/api/models/DataCategory.ts diff --git a/clients/admin-ui/src/types/api/models/DataProtectionImpactAssessment.ts b/clients/ctl/admin-ui/src/types/api/models/DataProtectionImpactAssessment.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataProtectionImpactAssessment.ts rename to clients/ctl/admin-ui/src/types/api/models/DataProtectionImpactAssessment.ts diff --git a/clients/admin-ui/src/types/api/models/DataQualifier.ts b/clients/ctl/admin-ui/src/types/api/models/DataQualifier.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataQualifier.ts rename to clients/ctl/admin-ui/src/types/api/models/DataQualifier.ts diff --git a/clients/admin-ui/src/types/api/models/DataResponsibilityTitle.ts b/clients/ctl/admin-ui/src/types/api/models/DataResponsibilityTitle.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataResponsibilityTitle.ts rename to clients/ctl/admin-ui/src/types/api/models/DataResponsibilityTitle.ts diff --git a/clients/admin-ui/src/types/api/models/DataSubject.ts b/clients/ctl/admin-ui/src/types/api/models/DataSubject.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataSubject.ts rename to clients/ctl/admin-ui/src/types/api/models/DataSubject.ts diff --git a/clients/admin-ui/src/types/api/models/DataSubjectRights.ts b/clients/ctl/admin-ui/src/types/api/models/DataSubjectRights.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataSubjectRights.ts rename to clients/ctl/admin-ui/src/types/api/models/DataSubjectRights.ts diff --git a/clients/admin-ui/src/types/api/models/DataSubjectRightsEnum.ts b/clients/ctl/admin-ui/src/types/api/models/DataSubjectRightsEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataSubjectRightsEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/DataSubjectRightsEnum.ts diff --git a/clients/admin-ui/src/types/api/models/DataUse.ts b/clients/ctl/admin-ui/src/types/api/models/DataUse.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DataUse.ts rename to clients/ctl/admin-ui/src/types/api/models/DataUse.ts diff --git a/clients/admin-ui/src/types/api/models/DatabaseConfig.ts b/clients/ctl/admin-ui/src/types/api/models/DatabaseConfig.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DatabaseConfig.ts rename to clients/ctl/admin-ui/src/types/api/models/DatabaseConfig.ts diff --git a/clients/admin-ui/src/types/api/models/Dataset.ts b/clients/ctl/admin-ui/src/types/api/models/Dataset.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Dataset.ts rename to clients/ctl/admin-ui/src/types/api/models/Dataset.ts diff --git a/clients/admin-ui/src/types/api/models/DatasetCollection.ts b/clients/ctl/admin-ui/src/types/api/models/DatasetCollection.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DatasetCollection.ts rename to clients/ctl/admin-ui/src/types/api/models/DatasetCollection.ts diff --git a/clients/admin-ui/src/types/api/models/DatasetField.ts b/clients/ctl/admin-ui/src/types/api/models/DatasetField.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DatasetField.ts rename to clients/ctl/admin-ui/src/types/api/models/DatasetField.ts diff --git a/clients/admin-ui/src/types/api/models/DatasetMetadata.ts b/clients/ctl/admin-ui/src/types/api/models/DatasetMetadata.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/DatasetMetadata.ts rename to clients/ctl/admin-ui/src/types/api/models/DatasetMetadata.ts diff --git a/clients/admin-ui/src/types/api/models/Evaluation.ts b/clients/ctl/admin-ui/src/types/api/models/Evaluation.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Evaluation.ts rename to clients/ctl/admin-ui/src/types/api/models/Evaluation.ts diff --git a/clients/admin-ui/src/types/api/models/FigureTypeEnum.ts b/clients/ctl/admin-ui/src/types/api/models/FigureTypeEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/FigureTypeEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/FigureTypeEnum.ts diff --git a/clients/admin-ui/src/types/api/models/Generate.ts b/clients/ctl/admin-ui/src/types/api/models/Generate.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Generate.ts rename to clients/ctl/admin-ui/src/types/api/models/Generate.ts diff --git a/clients/admin-ui/src/types/api/models/GenerateRequestPayload.ts b/clients/ctl/admin-ui/src/types/api/models/GenerateRequestPayload.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/GenerateRequestPayload.ts rename to clients/ctl/admin-ui/src/types/api/models/GenerateRequestPayload.ts diff --git a/clients/admin-ui/src/types/api/models/GenerateResponse.ts b/clients/ctl/admin-ui/src/types/api/models/GenerateResponse.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/GenerateResponse.ts rename to clients/ctl/admin-ui/src/types/api/models/GenerateResponse.ts diff --git a/clients/admin-ui/src/types/api/models/GenerateTypes.ts b/clients/ctl/admin-ui/src/types/api/models/GenerateTypes.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/GenerateTypes.ts rename to clients/ctl/admin-ui/src/types/api/models/GenerateTypes.ts diff --git a/clients/admin-ui/src/types/api/models/HTTPValidationError.ts b/clients/ctl/admin-ui/src/types/api/models/HTTPValidationError.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/HTTPValidationError.ts rename to clients/ctl/admin-ui/src/types/api/models/HTTPValidationError.ts diff --git a/clients/admin-ui/src/types/api/models/IncludeExcludeEnum.ts b/clients/ctl/admin-ui/src/types/api/models/IncludeExcludeEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/IncludeExcludeEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/IncludeExcludeEnum.ts diff --git a/clients/admin-ui/src/types/api/models/LegalBasisEnum.ts b/clients/ctl/admin-ui/src/types/api/models/LegalBasisEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/LegalBasisEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/LegalBasisEnum.ts diff --git a/clients/admin-ui/src/types/api/models/MatchesEnum.ts b/clients/ctl/admin-ui/src/types/api/models/MatchesEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/MatchesEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/MatchesEnum.ts diff --git a/clients/admin-ui/src/types/api/models/OktaConfig.ts b/clients/ctl/admin-ui/src/types/api/models/OktaConfig.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/OktaConfig.ts rename to clients/ctl/admin-ui/src/types/api/models/OktaConfig.ts diff --git a/clients/admin-ui/src/types/api/models/Organization.ts b/clients/ctl/admin-ui/src/types/api/models/Organization.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Organization.ts rename to clients/ctl/admin-ui/src/types/api/models/Organization.ts diff --git a/clients/admin-ui/src/types/api/models/OrganizationMetadata.ts b/clients/ctl/admin-ui/src/types/api/models/OrganizationMetadata.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/OrganizationMetadata.ts rename to clients/ctl/admin-ui/src/types/api/models/OrganizationMetadata.ts diff --git a/clients/admin-ui/src/types/api/models/Policy.ts b/clients/ctl/admin-ui/src/types/api/models/Policy.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Policy.ts rename to clients/ctl/admin-ui/src/types/api/models/Policy.ts diff --git a/clients/admin-ui/src/types/api/models/PolicyRule.ts b/clients/ctl/admin-ui/src/types/api/models/PolicyRule.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/PolicyRule.ts rename to clients/ctl/admin-ui/src/types/api/models/PolicyRule.ts diff --git a/clients/admin-ui/src/types/api/models/PrivacyDeclaration.ts b/clients/ctl/admin-ui/src/types/api/models/PrivacyDeclaration.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/PrivacyDeclaration.ts rename to clients/ctl/admin-ui/src/types/api/models/PrivacyDeclaration.ts diff --git a/clients/admin-ui/src/types/api/models/PrivacyRule.ts b/clients/ctl/admin-ui/src/types/api/models/PrivacyRule.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/PrivacyRule.ts rename to clients/ctl/admin-ui/src/types/api/models/PrivacyRule.ts diff --git a/clients/admin-ui/src/types/api/models/Registry.ts b/clients/ctl/admin-ui/src/types/api/models/Registry.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Registry.ts rename to clients/ctl/admin-ui/src/types/api/models/Registry.ts diff --git a/clients/admin-ui/src/types/api/models/ResourceFilter.ts b/clients/ctl/admin-ui/src/types/api/models/ResourceFilter.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ResourceFilter.ts rename to clients/ctl/admin-ui/src/types/api/models/ResourceFilter.ts diff --git a/clients/admin-ui/src/types/api/models/SpecialCategoriesEnum.ts b/clients/ctl/admin-ui/src/types/api/models/SpecialCategoriesEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/SpecialCategoriesEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/SpecialCategoriesEnum.ts diff --git a/clients/admin-ui/src/types/api/models/StatusEnum.ts b/clients/ctl/admin-ui/src/types/api/models/StatusEnum.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/StatusEnum.ts rename to clients/ctl/admin-ui/src/types/api/models/StatusEnum.ts diff --git a/clients/admin-ui/src/types/api/models/System.ts b/clients/ctl/admin-ui/src/types/api/models/System.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/System.ts rename to clients/ctl/admin-ui/src/types/api/models/System.ts diff --git a/clients/admin-ui/src/types/api/models/SystemMetadata.ts b/clients/ctl/admin-ui/src/types/api/models/SystemMetadata.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/SystemMetadata.ts rename to clients/ctl/admin-ui/src/types/api/models/SystemMetadata.ts diff --git a/clients/admin-ui/src/types/api/models/ValidTargets.ts b/clients/ctl/admin-ui/src/types/api/models/ValidTargets.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidTargets.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidTargets.ts diff --git a/clients/admin-ui/src/types/api/models/ValidateRequest.ts b/clients/ctl/admin-ui/src/types/api/models/ValidateRequest.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidateRequest.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidateRequest.ts diff --git a/clients/admin-ui/src/types/api/models/ValidateResponse.ts b/clients/ctl/admin-ui/src/types/api/models/ValidateResponse.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidateResponse.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidateResponse.ts diff --git a/clients/admin-ui/src/types/api/models/ValidationError.ts b/clients/ctl/admin-ui/src/types/api/models/ValidationError.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidationError.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidationError.ts diff --git a/clients/admin-ui/src/types/api/models/ValidationStatus.ts b/clients/ctl/admin-ui/src/types/api/models/ValidationStatus.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidationStatus.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidationStatus.ts diff --git a/clients/admin-ui/src/types/api/models/ValidationTarget.ts b/clients/ctl/admin-ui/src/types/api/models/ValidationTarget.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ValidationTarget.ts rename to clients/ctl/admin-ui/src/types/api/models/ValidationTarget.ts diff --git a/clients/admin-ui/src/types/api/models/Violation.ts b/clients/ctl/admin-ui/src/types/api/models/Violation.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/Violation.ts rename to clients/ctl/admin-ui/src/types/api/models/Violation.ts diff --git a/clients/admin-ui/src/types/api/models/ViolationAttributes.ts b/clients/ctl/admin-ui/src/types/api/models/ViolationAttributes.ts similarity index 100% rename from clients/admin-ui/src/types/api/models/ViolationAttributes.ts rename to clients/ctl/admin-ui/src/types/api/models/ViolationAttributes.ts diff --git a/clients/admin-ui/src/types/environment.d.ts b/clients/ctl/admin-ui/src/types/environment.d.ts similarity index 100% rename from clients/admin-ui/src/types/environment.d.ts rename to clients/ctl/admin-ui/src/types/environment.d.ts diff --git a/clients/admin-ui/src/types/errors/api.ts b/clients/ctl/admin-ui/src/types/errors/api.ts similarity index 100% rename from clients/admin-ui/src/types/errors/api.ts rename to clients/ctl/admin-ui/src/types/errors/api.ts diff --git a/clients/admin-ui/src/types/errors/index.ts b/clients/ctl/admin-ui/src/types/errors/index.ts similarity index 100% rename from clients/admin-ui/src/types/errors/index.ts rename to clients/ctl/admin-ui/src/types/errors/index.ts diff --git a/clients/admin-ui/src/types/errors/models.ts b/clients/ctl/admin-ui/src/types/errors/models.ts similarity index 100% rename from clients/admin-ui/src/types/errors/models.ts rename to clients/ctl/admin-ui/src/types/errors/models.ts diff --git a/clients/admin-ui/src/types/next-auth.d.ts b/clients/ctl/admin-ui/src/types/next-auth.d.ts similarity index 100% rename from clients/admin-ui/src/types/next-auth.d.ts rename to clients/ctl/admin-ui/src/types/next-auth.d.ts diff --git a/clients/admin-ui/tsconfig.json b/clients/ctl/admin-ui/tsconfig.json similarity index 100% rename from clients/admin-ui/tsconfig.json rename to clients/ctl/admin-ui/tsconfig.json