Merge pull request #1041 from owncloud/rename-ocis-phoenix

.drone.star

@@ -4,7 +4,7 @@ config = {
     'glauth':'',
     'konnectd':'',
     'ocis': '',
-    'ocis-phoenix':'',
+    'web':'',
     'ocis-pkg':'',
     'ocs':'',
     'proxy':'',
@@ -21,8 +21,8 @@ config = {
     'numberOfParts': 10
   },
   'uiTests': {
-    'phoenixBranch': 'master',
-    'phoenixCommit': '262cec1536156dae3281099aca2fde0febeec6e5',
+    'webBranch': 'master',
+    'webCommit': '1b7963eeb52999629682ccef6bff713c0df1729b',
       'suites': {
         'webUIBasic': [
           'webUILogin',
@@ -224,8 +224,8 @@ def testPipelines(ctx):
     pipelines.append(coreApiTests(ctx, config['apiTests']['coreBranch'], config['apiTests']['coreCommit'], runPart, config['apiTests']['numberOfParts'], 'owncloud'))
     pipelines.append(coreApiTests(ctx, config['apiTests']['coreBranch'], config['apiTests']['coreCommit'], runPart, config['apiTests']['numberOfParts'], 'ocis'))
 
-  pipelines += uiTests(ctx, config['uiTests']['phoenixBranch'], config['uiTests']['phoenixCommit'])
-  pipelines.append(accountsUITests(ctx, config['uiTests']['phoenixBranch'], config['uiTests']['phoenixCommit']))
+  pipelines += uiTests(ctx, config['uiTests']['webBranch'], config['uiTests']['webCommit'])
+  pipelines.append(accountsUITests(ctx, config['uiTests']['webBranch'], config['uiTests']['webCommit']))
   return pipelines
 
 def testOcisModule(ctx, module):
@@ -589,11 +589,11 @@ def benchmark(ctx):
     },
   }
 
-def uiTests(ctx, phoenixBranch, phoenixCommit):
+def uiTests(ctx, webBranch, webCommit):
   suiteNames = config['uiTests']['suites'].keys()
-  return [uiTestPipeline(ctx, suiteName, phoenixBranch, phoenixCommit) for suiteName in suiteNames]
+  return [uiTestPipeline(ctx, suiteName, webBranch, webCommit) for suiteName in suiteNames]
 
-def uiTestPipeline(ctx, suiteName, phoenixBranch = 'master', phoenixCommit = '', storage = 'owncloud', accounts_hash_difficulty = 4):
+def uiTestPipeline(ctx, suiteName, webBranch = 'master', webCommit = '', storage = 'owncloud', accounts_hash_difficulty = 4):
   suites = config['uiTests']['suites']
   paths = ""
   suite = suites[suiteName]
@@ -624,20 +624,20 @@ def uiTestPipeline(ctx, suiteName, phoenixBranch = 'master', phoenixCommit = '',
           'RUN_ON_OCIS': 'true',
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data',
           'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
-          'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
+          'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
           'TEST_TAGS': 'not @skipOnOCIS and not @skip',
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
           'TEST_PATHS': paths,
         },
         'commands': [
           'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing',
-          'git clone -b %s --single-branch --no-tags https://github.com/owncloud/phoenix.git /srv/app/phoenix' % (phoenixBranch),
-          'cp -r /srv/app/phoenix/tests/acceptance/filesForUpload/* /uploads',
-          'cd /srv/app/phoenix',
+          'git clone -b %s --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web' % (webBranch),
+          'cp -r /srv/app/web/tests/acceptance/filesForUpload/* /uploads',
+          'cd /srv/app/web',
         ] + ([
-          'git checkout %s' % (phoenixCommit)
-        ] if phoenixCommit != '' else []) + [
+          'git checkout %s' % (webCommit)
+        ] if webCommit != '' else []) + [
           'yarn install-all',
           'yarn run acceptance-tests-drone'
         ],
@@ -674,7 +674,7 @@ def uiTestPipeline(ctx, suiteName, phoenixBranch = 'master', phoenixCommit = '',
     },
   }
 
-def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud', accounts_hash_difficulty = 4):
+def accountsUITests(ctx, webBranch, webCommit, storage = 'owncloud', accounts_hash_difficulty = 4):
   return {
     'kind': 'pipeline',
     'type': 'docker',
@@ -696,21 +696,21 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud', acc
           'RUN_ON_OCIS': 'true',
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data',
           'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
-          'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
+          'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
           'TEST_TAGS': 'not @skipOnOCIS and not @skip',
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
-          'PHOENIX_PATH': '/srv/app/phoenix',
+          'WEB_PATH': '/srv/app/web',
           'FEATURE_PATH': '/drone/src/accounts/ui/tests/acceptance/features',
         },
         'commands': [
           'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing',
-          'git clone -b %s --single-branch --no-tags https://github.com/owncloud/phoenix.git /srv/app/phoenix' % (phoenixBranch),
-          'cp -r /srv/app/phoenix/tests/acceptance/filesForUpload/* /uploads',
-          'cd /srv/app/phoenix',
+          'git clone -b %s --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web' % (webBranch),
+          'cp -r /srv/app/web/tests/acceptance/filesForUpload/* /uploads',
+          'cd /srv/app/web',
         ] + ([
-          'git checkout %s' % (phoenixCommit)
-        ] if phoenixCommit != '' else []) + [
+          'git checkout %s' % (webCommit)
+        ] if webCommit != '' else []) + [
           'yarn install-all',
           'cd /drone/src/accounts',
           'yarn install --all',
@@ -1534,7 +1534,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4):
     'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
     'STORAGE_SHARING_USER_JSON_FILE': '/srv/app/tmp/ocis/shares.json',
     'PROXY_ENABLE_BASIC_AUTH': True,
-    'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
+    'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
     'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml',
     'KONNECTD_ISS': 'https://ocis-server:9200',
     'KONNECTD_TLS': 'true',

accounts/nightwatch.conf.js

@@ -1,10 +1,10 @@
 const path = require('path')
-const PHOENIX_PATH = process.env.PHOENIX_PATH
+const WEB_PATH = process.env.WEB_PATH
 
-const config = require(path.join(PHOENIX_PATH, 'nightwatch.conf.js'))
+const config = require(path.join(WEB_PATH, 'nightwatch.conf.js'))
 
-config.page_objects_path = [PHOENIX_PATH + '/tests/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects']
-config.custom_commands_path = PHOENIX_PATH + '/tests/acceptance/customCommands'
+config.page_objects_path = [WEB_PATH + '/tests/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects']
+config.custom_commands_path = WEB_PATH + '/tests/acceptance/customCommands'
 
 module.exports = {
   ...config

accounts/ui/components/accounts/Avatar.vue

@@ -21,7 +21,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   /**
-   * FIXME: this component has been copied over from phoenix. It should be moved over to ODS, then we can reuse it in
+   * FIXME: this component has been copied over from ownCloud Web. It should be moved over to ODS, then we can reuse it in
    * this extension.
    */
   name: 'Avatar',

accounts/ui/tests/run-acceptance-test.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ -z "$PHOENIX_PATH" ]
+if [ -z "$WEB_PATH" ]
 then
-	echo "PHOENIX_PATH env variable is not set, cannot find files for tests infrastructure"
+	echo "WEB_PATH env variable is not set, cannot find files for tests infrastructure"
 	exit 1
 fi
 
@@ -12,9 +12,9 @@ then
 	exit 1
 fi
 
-if [ -z "$PHOENIX_CONFIG" ]
+if [ -z "$WEB_UI_CONFIG" ]
 then
-	echo "PHOENIX_CONFIG env variable is not set, cannot find phoenix config file"
+	echo "WEB_UI_CONFIG env variable is not set, cannot find web config file"
 	exit 1
 fi
 
@@ -46,7 +46,7 @@ clean_up() {
 
 trap clean_up SIGHUP SIGINT SIGTERM EXIT
 
-cp -r "$PHOENIX_PATH"/tests ./"$testFolder"
+cp -r "$WEB_PATH"/tests ./"$testFolder"
 
 export SERVER_HOST=${SERVER_HOST:-https://localhost:9200}
 export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200}

deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml

@@ -2,7 +2,7 @@
 
 # OpenID Connect client registry.
 clients:
-  - id: phoenix
+  - id: web
     name: OCIS
     application_type: web
     insecure: yes

deployments/examples/cs3_users_ocis/docker-compose.yaml

@@ -79,11 +79,11 @@ services:
       PROXY_OIDC_INSECURE: "${INSECURE:-false}"
       PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       PROXY_TLS: "false"
-      # phoenix config
-      PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
-      PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
-      PHOENIX_WEB_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
-      PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      # web config
+      WEB_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      WEB_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
+      WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
+      WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       # storage config
       STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/

deployments/examples/ocis_keycloak/.env

@@ -15,7 +15,7 @@ TRAEFIK_ACME_MAIL=
 OCIS_DOCKER_TAG=
 # Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test"
 OCIS_DOMAIN=
-# owncloud Web openid connect client id. Defaults to "ocis-phoenix"
+# owncloud Web openid connect client id. Defaults to "web"
 OCIS_OIDC_CLIENT_ID=
 
 ### Keycloak ###

deployments/examples/ocis_keycloak/docker-compose.yml

@@ -53,12 +53,12 @@ services:
       PROXY_OIDC_INSECURE: "${INSECURE:-false}"
       PROXY_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}
       PROXY_TLS: "false"
-      # phoenix config
-      PHOENIX_OIDC_AUTHORITY: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}
-      PHOENIX_OIDC_CLIENT_ID: ${OCIS_OIDC_CLIENT_ID:-ocis-phoenix}
-      PHOENIX_OIDC_METADATA_URL: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}/.well-known/openid-configuration
-      PHOENIX_WEB_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
-      PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      # ownCloud Web config
+      WEB_OIDC_AUTHORITY: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}
+      WEB_OIDC_CLIENT_ID: ${OCIS_OIDC_CLIENT_ID:-web}
+      WEB_OIDC_METADATA_URL: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}/.well-known/openid-configuration
+      WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
+      WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       # storage config
       STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/

deployments/examples/ocis_traefik/config/identifier-registration.dist.yaml

@@ -2,7 +2,7 @@
 
 # OpenID Connect client registry.
 clients:
-  - id: phoenix
+  - id: web
     name: OCIS
     application_type: web
     insecure: yes

deployments/examples/ocis_traefik/docker-compose.yml

@@ -58,11 +58,11 @@ services:
       PROXY_OIDC_INSECURE: "${INSECURE:-false}"
       PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       PROXY_TLS: "false"
-      # phoenix config
-      PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
-      PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
-      PHOENIX_WEB_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
-      PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      # web config
+      WEB_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      WEB_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
+      WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
+      WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       # storage config
       STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/

deployments/examples/owncloud10_with_oc_web/config/oc10/config.php

@@ -50,7 +50,7 @@ function getConfigFromEnv() {
     'dbpassword' => getenv('OWNCLOUD_DB_PASSWORD'),
     'dbtableprefix' => getenv('OWNCLOUD_DB_PREFIX'),
 
-    'phoenix.baseUrl' => getenv('OCIS_DOMAIN'),
+    'web.baseUrl' => getenv('OCIS_DOMAIN'),
     'cors.allowed-domains' => [getenv('OCIS_DOMAIN')],
 
     'log_type' => 'owncloud',

deployments/examples/owncloud10_with_oc_web/config/ocis/config.dist.json

@@ -5,7 +5,7 @@
   "openIdConnect": {
     "metadata_url": "https://ocis.owncloud.test/.well-known/openid-configuration",
     "authority": "https://ocis.owncloud.test",
-    "client_id": "phoenix",
+    "client_id": "web",
     "response_type": "code",
     "scope": "openid profile email"
   },

deployments/examples/owncloud10_with_oc_web/config/ocis/identifier-registration.dist.yaml

@@ -1,7 +1,7 @@
 ---
 # OpenID Connect client registry.
 clients:
-  - id: phoenix
+  - id: web
     name: OCIS
     application_type: web
     insecure: yes

deployments/examples/owncloud10_with_oc_web/docker-compose.yml

@@ -97,7 +97,7 @@ services:
       # graph
       GRAPH_OIDC_ENDPOINT: https://${OC10_DOMAIN:-oc10.owncloud.test}/apps/graphapi/v1.0
       # web ui
-      PHOENIX_WEB_CONFIG: "/config/config.json"
+      WEB_UI_CONFIG: "/config/config.json"
       # storage - although not used, yet
       STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       STORAGE_OIDC_INSECURE: "${INSECURE:-false}"

docs/Makefile

@@ -3,7 +3,7 @@ config-docs-generate:
 	make -C ../glauth config-docs-generate
 	make -C ../konnectd config-docs-generate
 	make -C ../ocis config-docs-generate
-	make -C ../ocis-phoenix config-docs-generate
+	make -C ../web config-docs-generate
 	make -C ../ocis-pkg config-docs-generate
 	make -C ../ocs config-docs-generate
 	make -C ../proxy config-docs-generate

docs/_index.md

@@ -11,7 +11,7 @@ Welcome to our developer documentation. Here you can find developer documentatio
 - [oCIS](https://owncloud.github.io/ocis/) server
 - oCIS extensions
 - Clients, like:
-    - [Phoenix](https://github.com/owncloud/phoenix) - the new web frontend for oCIS and ownCloud
+    - [ownCloud Web](https://github.com/owncloud/web) - the new web frontend for oCIS and ownCloud
     - [ownCloud Android app](https://github.com/owncloud/android)
     - [ownCloud iOS app](https://github.com/owncloud/ios-app)
     - [ownCloud Desktop Syncing Client](https://github.com/owncloud/client)

docs/extensions/settings/_index.md

@@ -15,7 +15,7 @@ for other extensions to register new settings within oCIS. It is responsible for
 settings values as well.
 
 For ease of use, this extension provides an ocis-web extension which allows users to change their settings values.
-Please refer to the [ocis-web extension docs]({{< relref "../../ocis/development/extensions/#external-phoenix-apps" >}})
+Please refer to the [ocis-web extension docs]({{< relref "../../ocis/development/extensions/#external-ownCloud-Web-apps" >}})
 for running ocis-web extensions.
 
 {{< mermaid class="text-center">}}

docs/extensions/web/_index.md

@@ -0,0 +1,10 @@
+---
+title: "ownCloud Web"
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/web
+geekdocFilePath: _index.md
+---
+
+This service embeds [ownCloud Web](https://github.com/owncloud/web) to provide a UI for ownCloud Infinite Scale.

docs/extensions/ocis-phoenix/releasing.md → docs/extensions/web/releasing.md

@@ -2,37 +2,37 @@
 title: "Releasing"
 weight: 40
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/ocis-phoenix
+geekdocEditPath: edit/master/docs/extensions/web
 geekdocFilePath: releasing.md
 ---
 
 {{< toc >}}
 
 ## Releasing
 
-The next generation Web Frontend is shipped as an oCIS Extension. The `ocis-phoenix` extension is also embedded in the single binary and part of the `ocis server` command.
+The next generation Web Frontend is shipped as an oCIS Extension. The `ocis-web` extension is also embedded in the single binary and part of the `ocis server` command.
 
 To update this package within all the deliveries, we need to update the package in the following chain from the bottom to the top.
 
 ### Package Hierarchy
 
 - [ocis](https://githug.com/owncloud/ocis)
-    - [ocis-phoenix](https://github.com/owncloud/ocis-phoenix)
-      - [ocis-pkg](https://github.com/owncloud/ocis-pkg)
-      - [phoenix](https://github.com/owncloud/phoenix)
+    - [ocis-web](https://github.com/owncloud/ocis/tree/master/web)
+      - [ocis-pkg](https://github.com/owncloud/ocis/tree/master/ocis-pkg)
+      - [ownCloud Web](https://github.com/owncloud/web)
 
 #### Prerequisites
 
-Before updating the assets, make sure that [Phoenix](https://github.com/owncloud/phoenix) has been released first
+Before updating the assets, make sure that [ownCloud Web](https://github.com/owncloud/web) has been released first
 and take note of its release tag name.
 
-#### Updating ocis-phoenix
+#### Updating ocis-web
 
-1. Create a branch `release-$version`. in <https://github.com/owncloud/ocis-phoenix>
+1. Create a branch `release-$version`. in <https://github.com/owncloud/ocis>
 2. Create a Folder in `changelog` for the release version and date `mkdir $major.$minor.$patchVersion_YYYY-MM-DD`.
 3. Move all changelog items from the `changelog/unreleased/` folder to the `$major.$minor.$patchVersion_YYYY-MM-DD` folder.
 4. Update the go module `ocis-pkg` to the latest version <https://blog.golang.org/using-go-modules> .
-5. Update the phoenix asset by adjusting the value of `PHOENIX_ASSETS_VERSION` at the top of the Makefile and specify the tag name of the latest [Phoenix release](https://github.com/owncloud/phoenix/tags).
+5. Update the ownCloud Web asset by adjusting the value of `WEB_ASSETS_VERSION` at the top of the Makefile and specify the tag name of the latest [ownCloud Web release](https://github.com/owncloud/web/tags).
 6. Run `make clean generate`.
 7. Create a changelog item for the update in the `changelog/$major.$minor.$patchVersion_YYYY-MM-DD` folder.
 8. Commit your changes.
@@ -41,7 +41,3 @@ and take note of its release tag name.
 11. Use `v$major.$minor.$patch` as a tag (the `v` prefix is important) and publish it.
 12. The tag and the Release artifacts will be created automatically.
 
-#### Next steps
-
-Next steps is usually updating the ocis-phoenix version in the [ocis](https://githug.com/owncloud/ocis) repository.
-